From b2ab68f8147f144c3e60caa26f38317a4b073b03 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Sat, 23 Jan 2016 14:50:23 -0500
Subject: [PATCH] Add a Dockerfile to build 1.5.3 with patches.

Specifically this pulls in the following:

https://go-review.googlesource.com/12717
https://go-review.googlesource.com/17247

These fix bugs users have encountered -- the first with the PKI backend,
and the second with Vault generally, as it can bite any use of a
certificate within Vault (listener, cert credential backend, pki
backend).

These are in 1.6, but it will probably be released too late for us given
what is currently known about their release plans and our known
deadline. This lets us build our releases against a patched 1.5.3.
---
 scripts/cross/Dockerfile-patched-1.5.3 | 38 ++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 scripts/cross/Dockerfile-patched-1.5.3

diff --git a/scripts/cross/Dockerfile-patched-1.5.3 b/scripts/cross/Dockerfile-patched-1.5.3
new file mode 100644
index 000000000..0296ac3c9
--- /dev/null
+++ b/scripts/cross/Dockerfile-patched-1.5.3
@@ -0,0 +1,38 @@
+# Adapted from tcnksm/dockerfile-gox -- thanks!
+
+FROM debian:jessie
+
+RUN apt-get update -y && apt-get install --no-install-recommends -y -q \
+                         curl \
+                         zip \
+                         build-essential \
+                         ca-certificates \
+                         git mercurial bzr \
+               && rm -rf /var/lib/apt/lists/*
+
+ENV GOVERSION 1.5.3
+RUN mkdir /goroot-upstream && mkdir /gopath-upstream && mkdir /gopath
+RUN curl https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz \
+           | tar xvzf - -C /goroot-upstream --strip-components=1
+
+ENV GOROOT_BOOTSTRAP /goroot-upstream
+RUN git clone https://github.com/golang/go /goroot
+WORKDIR /goroot/src
+RUN git config user.email "jeff@hashicorp.com"
+RUN git config user.name "Jeff Mitchell"
+RUN git checkout -b go1.5.3-fixed-x509 go1.5.3
+RUN git cherry-pick e78e654c1de0a7bfe0314d6954d42b046f14f1bb
+RUN git cherry-pick a0ea93dea5f5741addc8c96b7ed037d0e359e33f
+RUN ./all.bash
+
+ENV GOPATH /gopath
+ENV GOROOT /goroot
+ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
+
+RUN go get github.com/mitchellh/gox
+RUN go get github.com/tools/godep
+
+RUN mkdir -p /gopath/src/github.com/hashicorp/vault
+WORKDIR /gopath/src/github.com/hashicorp/vault
+ENV CGO_ENABLED=0
+CMD make bin