From 8dc13bcf1adf7dd81fa7490371914bdf2d48e852 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Fri, 16 Jan 2015 10:18:54 +0100 Subject: [PATCH] go1.4.1 --- build.sh | 2 +- docker/Dockerfile | 18 +++++++++--------- docker/go-9102.patch | 22 ---------------------- 3 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 docker/go-9102.patch diff --git a/build.sh b/build.sh index fd4a45093..b88241320 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ set -euo pipefail IFS=$'\n\t' -DOCKERIMGV=1.4-5 +DOCKERIMGV=1.4.1-1 case "${1:-default}" in default) diff --git a/docker/Dockerfile b/docker/Dockerfile index c8a77ce23..dfb5143a8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM debian:squeeze MAINTAINER Jakob Borg -ENV GOLANG_VERSION 1.4 +ENV GOLANG_VERSION 1.4.1 # SCMs for "go get", gcc for cgo RUN apt-get update && apt-get install -y \ @@ -34,14 +34,14 @@ RUN go get github.com/calmh/gonative \ # Rebuild the special and missing versions, using patches as appropriate -RUN mkdir /tmp/patches -ADD *.patch /tmp/patches/ -RUN bash -xec '\ - cd /usr/local/go ; \ - for patch in /tmp/patches/*.patch ; do \ - patch -p0 < "$patch" ; \ - done \ - ' +# RUN mkdir /tmp/patches +# ADD *.patch /tmp/patches/ +# RUN bash -xec '\ +# cd /usr/local/go ; \ +# for patch in /tmp/patches/*.patch ; do \ +# patch -p0 < "$patch" ; \ +# done \ +# ' RUN bash -xec '\ cd /usr/local/go/src; \ diff --git a/docker/go-9102.patch b/docker/go-9102.patch deleted file mode 100644 index 300c50e21..000000000 --- a/docker/go-9102.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/syscall/route_openbsd.go.orig Fri Jul 25 23:38:47 2014 -+++ src/syscall/route_openbsd.go Fri Jul 25 23:39:20 2014 -@@ -12,16 +12,16 @@ func (any *anyMessage) toRoutingMessage(b []byte) Rout - switch any.Type { - case RTM_ADD, RTM_DELETE, RTM_CHANGE, RTM_GET, RTM_LOSING, RTM_REDIRECT, RTM_MISS, RTM_LOCK, RTM_RESOLVE: - p := (*RouteMessage)(unsafe.Pointer(any)) -- return &RouteMessage{Header: p.Header, Data: b[SizeofRtMsghdr:any.Msglen]} -+ return &RouteMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]} - case RTM_IFINFO: - p := (*InterfaceMessage)(unsafe.Pointer(any)) -- return &InterfaceMessage{Header: p.Header, Data: b[SizeofIfMsghdr:any.Msglen]} -+ return &InterfaceMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]} - case RTM_IFANNOUNCE: - p := (*InterfaceAnnounceMessage)(unsafe.Pointer(any)) - return &InterfaceAnnounceMessage{Header: p.Header} - case RTM_NEWADDR, RTM_DELADDR: - p := (*InterfaceAddrMessage)(unsafe.Pointer(any)) -- return &InterfaceAddrMessage{Header: p.Header, Data: b[SizeofIfaMsghdr:any.Msglen]} -+ return &InterfaceAddrMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]} - } - return nil - }