mirror of
https://github.com/octoleo/syncthing.git
synced 2024-09-19 13:19:01 +00:00
go1.4.1
This commit is contained in:
parent
261825a89b
commit
8dc13bcf1a
2
build.sh
2
build.sh
@ -2,7 +2,7 @@
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
IFS=$'\n\t'
|
IFS=$'\n\t'
|
||||||
|
|
||||||
DOCKERIMGV=1.4-5
|
DOCKERIMGV=1.4.1-1
|
||||||
|
|
||||||
case "${1:-default}" in
|
case "${1:-default}" in
|
||||||
default)
|
default)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
FROM debian:squeeze
|
FROM debian:squeeze
|
||||||
MAINTAINER Jakob Borg <jakob@nym.se>
|
MAINTAINER Jakob Borg <jakob@nym.se>
|
||||||
|
|
||||||
ENV GOLANG_VERSION 1.4
|
ENV GOLANG_VERSION 1.4.1
|
||||||
|
|
||||||
# SCMs for "go get", gcc for cgo
|
# SCMs for "go get", gcc for cgo
|
||||||
RUN apt-get update && apt-get install -y \
|
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
|
# Rebuild the special and missing versions, using patches as appropriate
|
||||||
|
|
||||||
RUN mkdir /tmp/patches
|
# RUN mkdir /tmp/patches
|
||||||
ADD *.patch /tmp/patches/
|
# ADD *.patch /tmp/patches/
|
||||||
RUN bash -xec '\
|
# RUN bash -xec '\
|
||||||
cd /usr/local/go ; \
|
# cd /usr/local/go ; \
|
||||||
for patch in /tmp/patches/*.patch ; do \
|
# for patch in /tmp/patches/*.patch ; do \
|
||||||
patch -p0 < "$patch" ; \
|
# patch -p0 < "$patch" ; \
|
||||||
done \
|
# done \
|
||||||
'
|
# '
|
||||||
|
|
||||||
RUN bash -xec '\
|
RUN bash -xec '\
|
||||||
cd /usr/local/go/src; \
|
cd /usr/local/go/src; \
|
||||||
|
@ -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
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user