Commit 6c2c69eb authored by Daniel Néri's avatar Daniel Néri Committed by Leo

testing/tailscale: upgrade to 1.6.0

parent 096f7b23
Pipeline #75730 failed with stages
in 27 seconds
......@@ -2,8 +2,8 @@
# Contributor: Christine Dodrill <xe@tailscale.com>
# Maintainer: Robert Günzler <r@gnzler.io>
pkgname=tailscale
pkgver=1.4.4
pkgrel=1
pkgver=1.6.0
pkgrel=0
pkgdesc="The easiest, most secure way to use WireGuard and 2FA"
url="https://tailscale.com/"
license="BSD-3-Clause"
......@@ -17,8 +17,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/tailscale/tailscale/archive/
tailscale.initd
tailscale.logrotate
tailscale.modules-load
dont-build-ole.patch
fix-ipv6.patch
"
builddir="$srcdir/src/github.com/tailscale/$pkgname"
......@@ -68,10 +66,8 @@ package() {
install -m644 -D "$srcdir"/tailscale.modules-load "$pkgdir"/usr/lib/modules-load.d/tailscale.conf
}
sha512sums="e519848f48386e73103c7e766247fcf6820a777ba8130a75590adeb56f513593668914736c9da7ec94abc7417a25e32f4f4ba32732b9810eb87c22d580f0832f tailscale-1.4.4.tar.gz
sha512sums="cdad6820f5f0ff1e1119c7e4107b96724e2ef1b096e89ac073fe195b03db7a9b9dba871da78888d58368714cea8dbedbc2835ea76146a4833913153712b39ac2 tailscale-1.6.0.tar.gz
24706f10a6f5f7091c0f73a13e0c2d72e969e92e6f7aa21abe504f8e2c16af4d1d80fd28c33acbe4866dd8174abd9dc201d97eb5271f6355f7589a56f470f52c tailscale.confd
5cb35e0144d3bc2c20b1fde1ee402aab642b666c259bb324bf1c742a79fd8b3892cf2e7419e684764a50b6a29dc562ee674915bbf16a76eda543fd9c8988428c tailscale.initd
c139461ff829359bfdc66866ef4cd6561f781e2bc3b40e5cfe9c9d06e3e749d179835ee8548d2b2e725f9a59644db64b1136393dff78ae29955c905e76c8ef46 tailscale.logrotate
871b650ff982be061532b4c5fe4812f41e6e2c58fc69b24f8a745f9a43389da44e742a69b0467b3c3d9e2b031af0728e20f10fa4584695c4f5ac87768a1fd34e tailscale.modules-load
a9c4eb134f1d510fc54da2d74d7896a0cdd3b931301cec21aacf44aee62d4db26f7edbf660d89c2dde692450135cb86c1188fe1a6c08caf08f6bce32d243d76b dont-build-ole.patch
4660baead8ec6e1dfd1936c82423eeb9c5244d896d035821fff3051039a96e5ca297c0ab6bcd62b7ab9b58267a401d716dd64fdecf77d4babd04bfb8ab138dea fix-ipv6.patch"
871b650ff982be061532b4c5fe4812f41e6e2c58fc69b24f8a745f9a43389da44e742a69b0467b3c3d9e2b031af0728e20f10fa4584695c4f5ac87768a1fd34e tailscale.modules-load"
From 16c67870d371f02a4ae2e5d93dd11d401d15aee0 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Tue, 9 Feb 2021 21:08:18 -0800
Subject: [PATCH] wgengine/winnet: don't build on non-windows
It only affects 'go install ./...', etc, and only on darwin/arm64 (M1 Macs) where
the go-ole package doesn't compile.
No need to build it.
Updates #943
(cherry picked from commit cbd6224ca41d0c9f0ac0db96e5e2854eb6a5212e)
---
wgengine/winnet/winnet.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/wgengine/winnet/winnet.go b/wgengine/winnet/winnet.go
index be76fd9c..086b0763 100644
--- a/wgengine/winnet/winnet.go
+++ b/wgengine/winnet/winnet.go
@@ -2,13 +2,16 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build windows
+
package winnet
import (
"fmt"
+ "unsafe"
+
"github.com/go-ole/go-ole"
"github.com/go-ole/go-ole/oleutil"
- "unsafe"
)
const CLSID_NetworkListManager = "{DCB00C01-570F-4A9B-8D69-199FDBA5723B}"
From 5445a5c7b73f8d60939fe2dfccb3816d28fe5ad0 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Tue, 16 Feb 2021 10:20:24 -0800
Subject: [PATCH] wgengine/tsdns: skip test that requires local IPv6 when IPv6
unavailable
Fixes #1292
Cherry picked from b923ea76b15863e82cd808fbeb3d2a83fa24d303
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Signed-off-by: Christine Dodrill <xe@tailscale.com>
---
wgengine/tsdns/tsdns_server_test.go | 10 ++++++++--
wgengine/tsdns/tsdns_test.go | 23 ++++++++++++++++++-----
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/wgengine/tsdns/tsdns_server_test.go b/wgengine/tsdns/tsdns_server_test.go
index bffb8b86..34f89c3f 100644
--- a/wgengine/tsdns/tsdns_server_test.go
+++ b/wgengine/tsdns/tsdns_server_test.go
@@ -5,6 +5,8 @@
package tsdns
import (
+ "testing"
+
"github.com/miekg/dns"
"inet.af/netaddr"
)
@@ -71,7 +73,7 @@ func resolveToNXDOMAIN(w dns.ResponseWriter, req *dns.Msg) {
w.WriteMsg(m)
}
-func serveDNS(addr string) (*dns.Server, chan error) {
+func serveDNS(tb testing.TB, addr string) (*dns.Server, chan error) {
server := &dns.Server{Addr: addr, Net: "udp"}
waitch := make(chan struct{})
@@ -79,7 +81,11 @@ func serveDNS(addr string) (*dns.Server, chan error) {
errch := make(chan error, 1)
go func() {
- errch <- server.ListenAndServe()
+ err := server.ListenAndServe()
+ if err != nil {
+ tb.Logf("ListenAndServe(%q): %v", addr, err)
+ }
+ errch <- err
close(errch)
}()
diff --git a/wgengine/tsdns/tsdns_test.go b/wgengine/tsdns/tsdns_test.go
index 2eb0df47..77f0d4b9 100644
--- a/wgengine/tsdns/tsdns_test.go
+++ b/wgengine/tsdns/tsdns_test.go
@@ -274,15 +274,28 @@ func TestResolveReverse(t *testing.T) {
}
}
+func ipv6Works() bool {
+ c, err := net.Listen("tcp", "[::1]:0")
+ if err != nil {
+ return false
+ }
+ c.Close()
+ return true
+}
+
func TestDelegate(t *testing.T) {
rc := tstest.NewResourceCheck()
defer rc.Assert(t)
+ if !ipv6Works() {
+ t.Skip("skipping test that requires localhost IPv6")
+ }
+
dnsHandleFunc("test.site.", resolveToIP(testipv4, testipv6, "dns.test.site."))
dnsHandleFunc("nxdomain.site.", resolveToNXDOMAIN)
- v4server, v4errch := serveDNS("127.0.0.1:0")
- v6server, v6errch := serveDNS("[::1]:0")
+ v4server, v4errch := serveDNS(t, "127.0.0.1:0")
+ v6server, v6errch := serveDNS(t, "[::1]:0")
defer func() {
if err := <-v4errch; err != nil {
@@ -372,7 +385,7 @@ func TestDelegate(t *testing.T) {
func TestDelegateCollision(t *testing.T) {
dnsHandleFunc("test.site.", resolveToIP(testipv4, testipv6, "dns.test.site."))
- server, errch := serveDNS("127.0.0.1:0")
+ server, errch := serveDNS(t, "127.0.0.1:0")
defer func() {
if err := <-errch; err != nil {
t.Errorf("server error: %v", err)
@@ -474,7 +487,7 @@ func TestConcurrentSetMap(t *testing.T) {
func TestConcurrentSetUpstreams(t *testing.T) {
dnsHandleFunc("test.site.", resolveToIP(testipv4, testipv6, "dns.test.site."))
- server, errch := serveDNS("127.0.0.1:0")
+ server, errch := serveDNS(t, "127.0.0.1:0")
defer func() {
if err := <-errch; err != nil {
t.Errorf("server error: %v", err)
@@ -753,7 +766,7 @@ func TestTrimRDNSBonjourPrefix(t *testing.T) {
func BenchmarkFull(b *testing.B) {
dnsHandleFunc("test.site.", resolveToIP(testipv4, testipv6, "dns.test.site."))
- server, errch := serveDNS("127.0.0.1:0")
+ server, errch := serveDNS(b, "127.0.0.1:0")
defer func() {
if err := <-errch; err != nil {
b.Errorf("server error: %v", err)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment