From a2d553237d41eb0428aea5175473e7bd54f2a6f4 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Wed, 26 Nov 2025 21:00:30 +0800 Subject: [PATCH 01/13] chore(go): update tailscale.com 1.88.3 -> 1.90.9 --- src/wrapper/go.mod | 15 +++++---------- src/wrapper/go.sum | 35 ++++++----------------------------- 2 files changed, 11 insertions(+), 39 deletions(-) diff --git a/src/wrapper/go.mod b/src/wrapper/go.mod index b545bbae..1aa92428 100644 --- a/src/wrapper/go.mod +++ b/src/wrapper/go.mod @@ -1,10 +1,10 @@ module tailwrap -go 1.25.1 +go 1.25.3 require ( golang.org/x/net v0.47.0 - tailscale.com v1.88.3 + tailscale.com v1.90.9 ) require ( @@ -15,16 +15,15 @@ require ( github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect github.com/atotto/clipboard v0.1.4 // indirect github.com/coder/websocket v1.8.12 // indirect - github.com/coreos/go-iptables v0.7.1-0.20240112124308-65c67c9f46e6 // indirect github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect github.com/fogleman/gg v1.3.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/gaissmai/bart v0.18.0 // indirect github.com/go-json-experiment/json v0.0.0-20250813024750-ebf49471dced // indirect github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/google/go-cmp v0.6.0 // indirect - github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806 // indirect + github.com/google/go-cmp v0.7.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect github.com/jsimonetti/rtnetlink v1.4.0 // indirect @@ -33,29 +32,25 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 // indirect github.com/mdlayher/socket v0.5.0 // indirect - github.com/miekg/dns v1.1.58 // indirect github.com/mitchellh/go-ps v1.0.0 // indirect github.com/peterbourgon/ff/v3 v3.4.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect - github.com/tailscale/netlink v1.1.1-0.20240822203006-4d49adab4de7 // indirect + github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976 // indirect github.com/toqueteos/webbrowser v1.2.0 // indirect - github.com/vishvananda/netns v0.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect golang.org/x/crypto v0.45.0 // indirect golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect golang.org/x/image v0.27.0 // indirect - golang.org/x/mod v0.29.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/sync v0.18.0 // indirect golang.org/x/sys v0.38.0 // indirect golang.org/x/text v0.31.0 // indirect golang.org/x/time v0.11.0 // indirect - golang.org/x/tools v0.38.0 // indirect golang.zx2c4.com/wireguard/windows v0.5.3 // indirect k8s.io/client-go v0.32.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/src/wrapper/go.sum b/src/wrapper/go.sum index 351620e0..31e7a12a 100644 --- a/src/wrapper/go.sum +++ b/src/wrapper/go.sum @@ -16,8 +16,6 @@ github.com/cilium/ebpf v0.15.0 h1:7NxJhNiBT3NG8pZJ3c+yfrVdHY8ScgKD27sScgjLMMk= github.com/cilium/ebpf v0.15.0/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso= github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo= github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= -github.com/coreos/go-iptables v0.7.1-0.20240112124308-65c67c9f46e6 h1:8h5+bWd7R6AYUslN6c6iuZWTKsKxUFDlpnmilO6R2n0= -github.com/coreos/go-iptables v0.7.1-0.20240112124308-65c67c9f46e6/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/creachadair/taskgroup v0.13.2 h1:3KyqakBuFsm3KkXi/9XIb0QcA8tEzLHLgaoidf0MdVc= github.com/creachadair/taskgroup v0.13.2/go.mod h1:i3V1Zx7H8RjwljUEeUWYT30Lmb9poewSb2XI1yTwD0g= github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa h1:h8TfIT1xc8FWbwwpmHn1J5i43Y0uZP97GqasGCzSRJk= @@ -32,27 +30,19 @@ github.com/gaissmai/bart v0.18.0 h1:jQLBT/RduJu0pv/tLwXE+xKPgtWJejbxuXAR+wLJafo= github.com/gaissmai/bart v0.18.0/go.mod h1:JJzMAhNF5Rjo4SF4jWBrANuJfqY+FvsFhW7t1UZJ+XY= github.com/go-json-experiment/json v0.0.0-20250813024750-ebf49471dced h1:Q311OHjMh/u5E2TITc++WlTP5We0xNseRMkHDyvhW7I= github.com/go-json-experiment/json v0.0.0-20250813024750-ebf49471dced/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M= -github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= -github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 h1:sQspH8M4niEijh3PFscJRLDnkL547IeP7kpPe3uUhEg= github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466/go.mod h1:ZiQxhyQ+bbbfxUKVvjfO498oPYvtYhZzycal3G/NHmU= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= -github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806 h1:wG8RYIyctLhdFk6Vl1yPGtSRtwGpVkWyZww1OCil2MI= -github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806/go.mod h1:Beg6V6zZ3oEn0JuiUQ4wqwuyqqzasOltcoXPtgLbFp4= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= -github.com/illarion/gonotify/v3 v3.0.2 h1:O7S6vcopHexutmpObkeWsnzMJt/r1hONIEogeVNmJMk= -github.com/illarion/gonotify/v3 v3.0.2/go.mod h1:HWGPdPe817GfvY3w7cx6zkbzNZfi3QjcBm/wgVvEL1U= github.com/jsimonetti/rtnetlink v1.4.0 h1:Z1BF0fRgcETPEa0Kt0MRk3yV5+kF1FWTni6KUFKrq2I= github.com/jsimonetti/rtnetlink v1.4.0/go.mod h1:5W1jDvWdnthFJ7fxYX1GMK07BUpI4oskfOqvPteYS6E= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= @@ -66,14 +56,10 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mdlayher/genetlink v1.3.2 h1:KdrNKe+CTu+IbZnm/GVUMXSqBBLqcGpRDa0xkQy56gw= -github.com/mdlayher/genetlink v1.3.2/go.mod h1:tcC3pkCrPUGIKKsCsp0B3AdaaKuHtaxoJRz3cc+528o= github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 h1:A1Cq6Ysb0GM0tpKMbdCXCIfBclan4oHk1Jb+Hrejirg= github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42/go.mod h1:BB4YCPDOzfy7FniQ/lxuYQ3dgmM2cZumHbK8RpTjN2o= github.com/mdlayher/socket v0.5.0 h1:ilICZmJcQz70vrWVes1MFera4jGiWNocSkykwwoy3XI= github.com/mdlayher/socket v0.5.0/go.mod h1:WkcBFfvyG8QENs5+hfQPl1X6Jpd2yeLIYgrGFmJiJxI= -github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= -github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/peterbourgon/ff/v3 v3.4.0 h1:QBvM/rizZM1cB0p0lGMdmR7HxZeI/ZrBWB4DqLkMUBc= @@ -86,17 +72,14 @@ github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 h1:Gzfnfk2TWrk8 github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55/go.mod h1:4k4QO+dQ3R5FofL+SanAUZe+/QfeK0+OIuwDIRu2vSg= github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 h1:4chzWmimtJPxRs2O36yuGRW3f9SYV+bMTTvMBI0EKio= github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05/go.mod h1:PdCqy9JzfWMJf1H5UJW2ip33/d4YkoKN0r67yKH1mG8= -github.com/tailscale/netlink v1.1.1-0.20240822203006-4d49adab4de7 h1:uFsXVBE9Qr4ZoF094vE6iYTLDl0qCiKzYXlL6UeWObU= -github.com/tailscale/netlink v1.1.1-0.20240822203006-4d49adab4de7/go.mod h1:NzVQi3Mleb+qzq8VmcWpSkcSYxXIg0DkI6XDzpVkhJ0= +github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a h1:SJy1Pu0eH1C29XwJucQo73FrleVK6t4kYz4NVhp34Yw= +github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a/go.mod h1:DFSS3NAGHthKo1gTlmEcSBiZrRJXi28rLNd/1udP1c8= github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976 h1:UBPHPtv8+nEAy2PD8RyAhOYvau1ek0HDJqLS/Pysi14= github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976/go.mod h1:agQPE6y6ldqCOui2gkIh7ZMztTkIQKH049tv8siLuNQ= github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da h1:jVRUZPRs9sqyKlYHHzHjAqKN+6e/Vog6NpHYeNPJqOw= github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da/go.mod h1:BOm5fXUBFM+m9woLNBoxI9TaBXXhGNP50LX/TGIvGb4= github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ= github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY= -github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= go4.org/mem v0.0.0-20240501181205-ae6ca9944745 h1:Tl++JLUCe4sxGu8cTpDzRLd3tN7US4hOxG5YpKCzkek= @@ -118,8 +101,6 @@ golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKl golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -129,16 +110,12 @@ golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= -golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= -golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= golang.zx2c4.com/wireguard/windows v0.5.3 h1:On6j2Rpn3OEMXqBq00QEDC7bWSZrPIHKIus8eIuExIE= golang.zx2c4.com/wireguard/windows v0.5.3/go.mod h1:9TEe8TJmtwyQebdFwAkEWOPr3prrtqm+REGFifP60hI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gvisor.dev/gvisor v0.0.0-20250205023644-9414b50a5633 h1:2gap+Kh/3F47cO6hAu3idFvsJ0ue6TRcEi2IUkv/F8k= -gvisor.dev/gvisor v0.0.0-20250205023644-9414b50a5633/go.mod h1:5DMfjtclAbTIjbXqO1qCe2K5GKKxWz2JHvCChuTcJEM= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= @@ -147,5 +124,5 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k= software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI= -tailscale.com v1.88.3 h1:OiE6iVqzykhbITxmIKjH8d00cw0LsJFO3TuFd4jQVXU= -tailscale.com v1.88.3/go.mod h1:LHaTiwRgzebPDLgZ6RQQVzX+1SR5fbNl51fzm7UtMaw= +tailscale.com v1.90.9 h1:foPasfgXCey5TGEFNeJbm2YeoyCYcrsg0TEHFrPhckA= +tailscale.com v1.90.9/go.mod h1:+9EX6pOGCNa6pxCVRhhlJLy/qnkDzOplFYpeZyYlCT0= From 33c487e8b75311581a00e9b3b2016f9e3833c187 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Wed, 26 Nov 2025 22:00:05 +0800 Subject: [PATCH 02/13] chore(go): update to go v1.25.4 --- scripts/flatpak-deps.sh | 2 +- src/wrapper/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/flatpak-deps.sh b/scripts/flatpak-deps.sh index 61249d24..0e6193ec 100755 --- a/scripts/flatpak-deps.sh +++ b/scripts/flatpak-deps.sh @@ -4,4 +4,4 @@ flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/fl flatpak install --user -y flathub org.flatpak.Builder flatpak install --user -y flathub org.flathub.flatpak-external-data-checker flatpak install --user -y flathub org.kde.Sdk//6.9 org.kde.Platform/x86_64/6.9 -flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/24.08 +flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/25.08 diff --git a/src/wrapper/go.mod b/src/wrapper/go.mod index 1aa92428..0bff2026 100644 --- a/src/wrapper/go.mod +++ b/src/wrapper/go.mod @@ -1,6 +1,6 @@ module tailwrap -go 1.25.3 +go 1.25.4 require ( golang.org/x/net v0.47.0 From a9b583ab756dda13d0380d76f862957efeb4d361 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Fri, 28 Nov 2025 23:06:08 +0800 Subject: [PATCH 03/13] Revert "chore(go): update to go v1.25.4" This reverts commit 33c487e8b75311581a00e9b3b2016f9e3833c187. --- scripts/flatpak-deps.sh | 2 +- src/wrapper/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/flatpak-deps.sh b/scripts/flatpak-deps.sh index 0e6193ec..61249d24 100755 --- a/scripts/flatpak-deps.sh +++ b/scripts/flatpak-deps.sh @@ -4,4 +4,4 @@ flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/fl flatpak install --user -y flathub org.flatpak.Builder flatpak install --user -y flathub org.flathub.flatpak-external-data-checker flatpak install --user -y flathub org.kde.Sdk//6.9 org.kde.Platform/x86_64/6.9 -flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/25.08 +flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/24.08 diff --git a/src/wrapper/go.mod b/src/wrapper/go.mod index 0bff2026..1aa92428 100644 --- a/src/wrapper/go.mod +++ b/src/wrapper/go.mod @@ -1,6 +1,6 @@ module tailwrap -go 1.25.4 +go 1.25.3 require ( golang.org/x/net v0.47.0 From bafed3f2b8a47ba0ab656f7429e3a423d4e8037d Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Fri, 28 Nov 2025 23:07:23 +0800 Subject: [PATCH 04/13] chore(go): update tailscale.com v1.92.0 -> 1.90.9 --- src/wrapper/go.mod | 4 ++-- src/wrapper/go.sum | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/wrapper/go.mod b/src/wrapper/go.mod index 1aa92428..81eb400e 100644 --- a/src/wrapper/go.mod +++ b/src/wrapper/go.mod @@ -4,7 +4,7 @@ go 1.25.3 require ( golang.org/x/net v0.47.0 - tailscale.com v1.90.9 + tailscale.com v1.92.0 ) require ( @@ -44,7 +44,7 @@ require ( go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect golang.org/x/crypto v0.45.0 // indirect - golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect + golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect golang.org/x/image v0.27.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/sync v0.18.0 // indirect diff --git a/src/wrapper/go.sum b/src/wrapper/go.sum index 31e7a12a..447b6b9f 100644 --- a/src/wrapper/go.sum +++ b/src/wrapper/go.sum @@ -88,12 +88,12 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y= golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= -golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs= -golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo= +golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o= +golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8= golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w= golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g= -golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= -golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= +golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk= +golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc= golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= @@ -124,5 +124,5 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k= software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI= -tailscale.com v1.90.9 h1:foPasfgXCey5TGEFNeJbm2YeoyCYcrsg0TEHFrPhckA= -tailscale.com v1.90.9/go.mod h1:+9EX6pOGCNa6pxCVRhhlJLy/qnkDzOplFYpeZyYlCT0= +tailscale.com v1.92.0 h1:DvqrJjffuFfs5fuNaEVVgJ9gsEsuvf2VIvvHxfX8xIc= +tailscale.com v1.92.0/go.mod h1:0aiBAq9m2wumn3146mjvMh61NHrlOc79FZL8Q6orC6Y= From 93552bce1086a1cdc341157b2ec1dbfdf5d442cd Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Fri, 28 Nov 2025 23:19:35 +0800 Subject: [PATCH 05/13] chore(go): update go v1.25.3 -> v1.25.4 --- scripts/flatpak-deps.sh | 2 +- src/wrapper/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/flatpak-deps.sh b/scripts/flatpak-deps.sh index 61249d24..c9d1673f 100755 --- a/scripts/flatpak-deps.sh +++ b/scripts/flatpak-deps.sh @@ -1,7 +1,7 @@ #!/bin/bash set -euf -o pipefail flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo +flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/25.08 flatpak install --user -y flathub org.flatpak.Builder flatpak install --user -y flathub org.flathub.flatpak-external-data-checker flatpak install --user -y flathub org.kde.Sdk//6.9 org.kde.Platform/x86_64/6.9 -flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/24.08 diff --git a/src/wrapper/go.mod b/src/wrapper/go.mod index 81eb400e..a3264e94 100644 --- a/src/wrapper/go.mod +++ b/src/wrapper/go.mod @@ -1,6 +1,6 @@ module tailwrap -go 1.25.3 +go 1.25.4 require ( golang.org/x/net v0.47.0 From 2fa5e1a912715a384dbc4c5c3a6987a7354605b5 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Sat, 29 Nov 2025 16:18:29 +0800 Subject: [PATCH 06/13] fix(ci): fix go version when vendoring deps --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91a1ab8d..0e7a5618 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: - name: Setup go. uses: actions/setup-go@v6 with: - go-version: "stable" + go-version: "1.25.4" - name: Vendor go dependencies. run: go mod vendor working-directory: src/wrapper From f35b32f0f7755fe9c7a4df1a449158151d3b084a Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Sat, 29 Nov 2025 16:25:46 +0800 Subject: [PATCH 07/13] fix(ci): try to fix flatpak build issue in CI --- scripts/flatpak-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/flatpak-deps.sh b/scripts/flatpak-deps.sh index c9d1673f..e3c55023 100755 --- a/scripts/flatpak-deps.sh +++ b/scripts/flatpak-deps.sh @@ -2,6 +2,7 @@ set -euf -o pipefail flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/25.08 +flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/6.9 flatpak install --user -y flathub org.flatpak.Builder flatpak install --user -y flathub org.flathub.flatpak-external-data-checker flatpak install --user -y flathub org.kde.Sdk//6.9 org.kde.Platform/x86_64/6.9 From 0573ee5b363e216899c68a1b22377e88ee3a4a78 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Sat, 29 Nov 2025 17:07:11 +0800 Subject: [PATCH 08/13] fix(go): remove depcrecated module import --- src/wrapper/wrapper.go | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wrapper/wrapper.go b/src/wrapper/wrapper.go index 69714f4f..d80e1c6c 100644 --- a/src/wrapper/wrapper.go +++ b/src/wrapper/wrapper.go @@ -7,7 +7,6 @@ import ( "encoding/json" "fmt" - "tailscale.com/client/tailscale" "tailscale.com/cmd/tailscale/cli" "tailscale.com/ipn" ) From dfa3350caa0f596a6bc08f02ec8c73bbfc982a57 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Sat, 6 Dec 2025 11:39:10 +0800 Subject: [PATCH 09/13] fix(wrapper): fix updated local client import --- src/wrapper/wrapper.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wrapper/wrapper.go b/src/wrapper/wrapper.go index d80e1c6c..712a753e 100644 --- a/src/wrapper/wrapper.go +++ b/src/wrapper/wrapper.go @@ -8,10 +8,11 @@ import ( "fmt" "tailscale.com/cmd/tailscale/cli" + "tailscale.com/client/local" "tailscale.com/ipn" ) -var client tailscale.LocalClient +var client local.Client //export tailscale_down func tailscale_down() { From fdf4c8c8959ab0b0ceab2a4997f814d31f1526a0 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Sat, 6 Dec 2025 11:39:27 +0800 Subject: [PATCH 10/13] chore(go): go back to v1.90.9 of tailscale module --- src/wrapper/go.mod | 2 +- src/wrapper/go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wrapper/go.mod b/src/wrapper/go.mod index a3264e94..43d0d0ed 100644 --- a/src/wrapper/go.mod +++ b/src/wrapper/go.mod @@ -4,7 +4,7 @@ go 1.25.4 require ( golang.org/x/net v0.47.0 - tailscale.com v1.92.0 + tailscale.com v1.90.9 ) require ( diff --git a/src/wrapper/go.sum b/src/wrapper/go.sum index 447b6b9f..3e944a90 100644 --- a/src/wrapper/go.sum +++ b/src/wrapper/go.sum @@ -92,8 +92,8 @@ golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/y golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8= golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w= golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g= -golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk= -golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc= +golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= +golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= @@ -124,5 +124,5 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k= software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI= -tailscale.com v1.92.0 h1:DvqrJjffuFfs5fuNaEVVgJ9gsEsuvf2VIvvHxfX8xIc= -tailscale.com v1.92.0/go.mod h1:0aiBAq9m2wumn3146mjvMh61NHrlOc79FZL8Q6orC6Y= +tailscale.com v1.90.9 h1:foPasfgXCey5TGEFNeJbm2YeoyCYcrsg0TEHFrPhckA= +tailscale.com v1.90.9/go.mod h1:+9EX6pOGCNa6pxCVRhhlJLy/qnkDzOplFYpeZyYlCT0= From db92343a563d5fd377ad84ba05d678bf0d49c55f Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Sat, 6 Dec 2025 11:39:48 +0800 Subject: [PATCH 11/13] chore(flatpak): bump kde runtime version to get correct go extension --- org.fkoehler.KTailctl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.fkoehler.KTailctl.yml b/org.fkoehler.KTailctl.yml index 277307d3..528b3342 100644 --- a/org.fkoehler.KTailctl.yml +++ b/org.fkoehler.KTailctl.yml @@ -1,6 +1,6 @@ app-id: org.fkoehler.KTailctl runtime: org.kde.Platform -runtime-version: "6.9" +runtime-version: "6.10" sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.golang From 3548629fdfada2c5ba9682d4ef6e46a14bdf7231 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Sat, 6 Dec 2025 11:43:25 +0800 Subject: [PATCH 12/13] fix(ci): fix flatpak deps for CI --- scripts/flatpak-deps.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/flatpak-deps.sh b/scripts/flatpak-deps.sh index e3c55023..532416f3 100755 --- a/scripts/flatpak-deps.sh +++ b/scripts/flatpak-deps.sh @@ -2,7 +2,6 @@ set -euf -o pipefail flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/25.08 -flatpak install --user -y flathub org.freedesktop.Sdk.Extension.golang/x86_64/6.9 flatpak install --user -y flathub org.flatpak.Builder flatpak install --user -y flathub org.flathub.flatpak-external-data-checker -flatpak install --user -y flathub org.kde.Sdk//6.9 org.kde.Platform/x86_64/6.9 +flatpak install --user -y flathub org.kde.Sdk//6.10 org.kde.Platform/x86_64/6.10 From 3d0080cb05069aafee9a3502abf11ae99ed5a6b6 Mon Sep 17 00:00:00 2001 From: Fabian Koehler Date: Sat, 6 Dec 2025 11:58:42 +0800 Subject: [PATCH 13/13] fix(wrapper): fix wrapper.go formatting --- src/wrapper/wrapper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wrapper/wrapper.go b/src/wrapper/wrapper.go index 712a753e..82ec2b4b 100644 --- a/src/wrapper/wrapper.go +++ b/src/wrapper/wrapper.go @@ -7,8 +7,8 @@ import ( "encoding/json" "fmt" - "tailscale.com/cmd/tailscale/cli" "tailscale.com/client/local" + "tailscale.com/cmd/tailscale/cli" "tailscale.com/ipn" )