aboutsummaryrefslogtreecommitdiff
path: root/net/tailscale
diff options
context:
space:
mode:
authorZephyr Lykos <git@mochaa.ws>2023-05-02 18:14:54 +0800
committerTianling Shen <cnsztl@gmail.com>2023-05-03 10:49:10 +0800
commit69c983391f1592a16729522e83f09063acb3c441 (patch)
tree6cbb92d4f48791533e3e68d0745e6a42d0358f53 /net/tailscale
parent829a9a61c26421032a4184c1dabc460bad4aea33 (diff)
tailscale: update to 1.40.0
Signed-off-by: Zephyr Lykos <git@mochaa.ws>
Diffstat (limited to 'net/tailscale')
-rw-r--r--net/tailscale/Makefile8
-rw-r--r--net/tailscale/patches/010-fake_iptables.patch2
-rw-r--r--net/tailscale/patches/020-tailscaled_fake_iptables.patch2
-rw-r--r--net/tailscale/patches/030-default_to_netfilter_off.patch2
4 files changed, 7 insertions, 7 deletions
diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile
index b3d280f35..53dffb790 100644
--- a/net/tailscale/Makefile
+++ b/net/tailscale/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tailscale
-PKG_VERSION:=1.36.0
+PKG_VERSION:=1.40.0
PKG_RELEASE:=1
PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=25b293a7e65d7b962f0c56454d66fa56c89c3aa995467218f24efa335b924c76
+PKG_HASH:=6964176889943e0e0b25d8d69e14226cfb1c1a9944a257b24cb2dd212f797141
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=BSD-3-Clause
@@ -27,8 +27,8 @@ PKG_BUILD_FLAGS:=no-mips16
GO_PKG:=\
tailscale.com/cmd/tailscale \
tailscale.com/cmd/tailscaled
-GO_PKG_LDFLAGS:=-X 'tailscale.com/version.Long=$(PKG_VERSION)-$(PKG_RELEASE) (OpenWrt)'
-GO_PKG_LDFLAGS_X:=tailscale.com/version.Short=$(PKG_VERSION)
+GO_PKG_LDFLAGS:=-X 'tailscale.com/version.longStamp=$(PKG_VERSION)-$(PKG_RELEASE) (OpenWrt)'
+GO_PKG_LDFLAGS_X:=tailscale.com/version.shortStamp=$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk
diff --git a/net/tailscale/patches/010-fake_iptables.patch b/net/tailscale/patches/010-fake_iptables.patch
index 07e14fbf5..2874f53b0 100644
--- a/net/tailscale/patches/010-fake_iptables.patch
+++ b/net/tailscale/patches/010-fake_iptables.patch
@@ -2,7 +2,7 @@
+++ b/go.mod
@@ -2,6 +2,8 @@ module tailscale.com
- go 1.19
+ go 1.20
+replace github.com/coreos/go-iptables => ./patched/go-iptables
+
diff --git a/net/tailscale/patches/020-tailscaled_fake_iptables.patch b/net/tailscale/patches/020-tailscaled_fake_iptables.patch
index 2180080ca..a4d54bdc6 100644
--- a/net/tailscale/patches/020-tailscaled_fake_iptables.patch
+++ b/net/tailscale/patches/020-tailscaled_fake_iptables.patch
@@ -18,7 +18,7 @@
}
}
-@@ -1635,11 +1635,6 @@ func checkIPv6(logf logger.Logf) error {
+@@ -1676,11 +1676,6 @@ func checkIPv6(logf logger.Logf) error {
return fmt.Errorf("kernel doesn't support IPv6 policy routing: %w", err)
}
diff --git a/net/tailscale/patches/030-default_to_netfilter_off.patch b/net/tailscale/patches/030-default_to_netfilter_off.patch
index 90c78fe69..1edd00225 100644
--- a/net/tailscale/patches/030-default_to_netfilter_off.patch
+++ b/net/tailscale/patches/030-default_to_netfilter_off.patch
@@ -1,6 +1,6 @@
--- a/cmd/tailscale/cli/up.go
+++ b/cmd/tailscale/cli/up.go
-@@ -143,7 +143,7 @@ func defaultNetfilterMode() string {
+@@ -147,7 +147,7 @@ func defaultNetfilterMode() string {
if distro.Get() == distro.Synology {
return "off"
}