nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-23 04:41:16 +00:00
Code Releases Activity

Update to Go 1.8, syncthing v0.14.24, fix dns patch for ipv6 (#853)

Browse source 
* Update to Go 1.8, syncthing v0.14.24, fix dns patch for ipv6

* GOARM=8 is no longer valid

* Unset GOARM
This commit is contained in:
Audrius Butkevicius 2017-03-10 12:34:19 +00:00 committed by Felix Ableitner
parent 245470a9d4
commit da84070472
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/golang/go

@ -1 +1 @@
Subproject commit 6b36535cf382bce845dd2d272276e7ba350b0c6b Subproject commit cd6b6202dd1559b3ac63179b45f1833fcfbe7eca

2
ext/syncthing/src/github.com/syncthing/syncthing

@ -1 +1 @@
Subproject commit 5a1ee7f0b0a9c5e0edf5b7db5bc593d441c77110 Subproject commit 28449f9f5bc8e5e994c5e9027dfc36c6f02d3a2c

2
make-go.bash
View file

@ -30,7 +30,7 @@ case "$1" in
arm64) arm64)
export GOOS=linux export GOOS=linux
export GOARCH=arm64 export GOARCH=arm64
export GOARM=8 unset GOARM
;; ;;
386) 386)
export GOOS=linux export GOOS=linux

2
make-syncthing.bash
View file

@ -17,7 +17,7 @@ case "$1" in
export CGO_ENABLED=0 export CGO_ENABLED=0
export GOOS=linux export GOOS=linux
export GOARCH=arm64 export GOARCH=arm64
export GOARM=8 unset GOARM
export TARGETDIR=$MYDIR$JNIDIR/arm64-v8a export TARGETDIR=$MYDIR$JNIDIR/arm64-v8a
;; ;;
386) 386)

11
patches/golang/all/dns.patch
View file

@ -1,6 +1,6 @@
--- /net/dnsconfig_unix.go 2016-08-20 08:14:05.763235602 -0400 --- /net/dnsconfig_unix.go 2016-08-20 08:14:05.763235602 -0400
+++ /net/dnsconfig_unix.go 2016-08-20 08:14:05.763235602 -0400 +++ /net/dnsconfig_unix.go 2016-08-20 08:14:05.763235602 -0400
@@ -9,15 +9,58 @@ @@ -9,16 +9,59 @@
package net package net
import ( import (
@ -8,6 +8,7 @@
"os" "os"
+ "os/exec" + "os/exec"
+ "strings" + "strings"
"sync/atomic"
"time" "time"
) )
@ -27,7 +28,7 @@
+ } + }
+ output := strings.Trim(string(outputBytes), "\n") + output := strings.Trim(string(outputBytes), "\n")
+ if ParseIP(output) != nil { + if ParseIP(output) != nil {
+ servers = append(servers, output + ":53") + servers = append(servers, JoinHostPort(output, "53"))
+ } + }
+ } + }
+ +
@ -60,7 +61,7 @@
type dnsConfig struct { type dnsConfig struct {
servers []string // server addresses (in host:port form) to use servers []string // server addresses (in host:port form) to use
search []string // rooted suffixes to append to local name search []string // rooted suffixes to append to local name
@@ -40,7 +83,7 @@ @@ -42,7 +85,7 @@ func dnsReadConfig(filename string) *dnsConfig {
} }
file, err := open(filename) file, err := open(filename)
if err != nil { if err != nil {
@ -69,7 +70,7 @@
conf.search = dnsDefaultSearch() conf.search = dnsDefaultSearch()
conf.err = err conf.err = err
return conf return conf
@@ -49,7 +92,7 @@ @@ -51,7 +94,7 @@ func dnsReadConfig(filename string) *dnsConfig {
if fi, err := file.file.Stat(); err == nil { if fi, err := file.file.Stat(); err == nil {
conf.mtime = fi.ModTime() conf.mtime = fi.ModTime()
} else { } else {
@ -78,7 +79,7 @@
conf.search = dnsDefaultSearch() conf.search = dnsDefaultSearch()
conf.err = err conf.err = err
return conf return conf
@@ -126,7 +169,7 @@ @@ -130,7 +173,7 @@ func dnsReadConfig(filename string) *dnsConfig {
} }
} }
if len(conf.servers) == 0 { if len(conf.servers) == 0 {