pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/tailscale
Module Name: pkgsrc
Committed By: schmonz
Date: Tue Jul 14 20:43:31 UTC 2026
Modified Files:
pkgsrc/net/tailscale: Makefile distinfo
pkgsrc/net/tailscale/files: tailscaled.sh
Added Files:
pkgsrc/net/tailscale/patches: patch-cmd_tailscaled_tailscaled.go
patch-hostinfo_hostinfo__darwin.go patch-paths_paths.go
patch-paths_paths__unix.go
Log Message:
tailscale: Follow hier(7). Improve version reporting.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/tailscale/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/tailscale/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/tailscale/files/tailscaled.sh
cvs rdiff -u -r0 -r1.1 \
pkgsrc/net/tailscale/patches/patch-cmd_tailscaled_tailscaled.go \
pkgsrc/net/tailscale/patches/patch-hostinfo_hostinfo__darwin.go \
pkgsrc/net/tailscale/patches/patch-paths_paths.go \
pkgsrc/net/tailscale/patches/patch-paths_paths__unix.go
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/tailscale/Makefile
diff -u pkgsrc/net/tailscale/Makefile:1.23 pkgsrc/net/tailscale/Makefile:1.24
--- pkgsrc/net/tailscale/Makefile:1.23 Wed Jul 8 18:32:34 2026
+++ pkgsrc/net/tailscale/Makefile Tue Jul 14 20:43:31 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2026/07/08 18:32:34 bsiegert Exp $
+# $NetBSD: Makefile,v 1.24 2026/07/14 20:43:31 schmonz Exp $
DISTNAME= tailscale
PKGNAME= tailscale-1.98.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=NuclearKev/}
GITHUB_PROJECT= tailscale
@@ -16,10 +16,19 @@ LICENSE= modified-bsd
GO_BUILD_PATTERN+= tailscale.com/cmd/tailscale
GO_BUILD_PATTERN+= tailscale.com/cmd/tailscaled
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= paths/paths_unix.go paths/paths.go
+SUBST_VARS.paths= VARBASE
+
+OWN_DIRS_PERMS+= ${VARBASE}/db/tailscale ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+
+BUILD_DEFS+= VARBASE
+
RCD_SCRIPTS+= tailscaled
-GOFLAGS= -ldflags "-X tailscale.com/version.longStamp=${PKGVERSION} \
- -X tailscale.com/version.shortStamp=${PKGVERSION}"
+GOFLAGS= -ldflags "-X tailscale.com/version.longStamp=${PKGVERSION_NOREV} \
+ -X tailscale.com/version.shortStamp=${PKGVERSION_NOREV}"
.include "go-modules.mk"
Index: pkgsrc/net/tailscale/distinfo
diff -u pkgsrc/net/tailscale/distinfo:1.6 pkgsrc/net/tailscale/distinfo:1.7
--- pkgsrc/net/tailscale/distinfo:1.6 Thu Jul 2 19:55:14 2026
+++ pkgsrc/net/tailscale/distinfo Tue Jul 14 20:43:31 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2026/07/02 19:55:14 ktnb Exp $
+$NetBSD: distinfo,v 1.7 2026/07/14 20:43:31 schmonz Exp $
BLAKE2s (4d63.com_gocheckcompilerdirectives_@v_v1.2.1.mod) = 467abef409ed18697f6f4f07f1d9c469cc7ba77b6b985e440b141c9ba37d0505
SHA512 (4d63.com_gocheckcompilerdirectives_@v_v1.2.1.mod) = 661d501b50181f5af0dfff7e269b704eaa97bc2659dc5f95f22dd886e71f8f8a13ae9ce36cddfff3a1c68a312b445291ba67c7a976841d12216cbc4caefaea80
@@ -4845,3 +4845,7 @@ Size (tailscale.com_client_tailscale_v2_
BLAKE2s (tailscale.com_client_tailscale_v2_@v_v2.9.0.zip) = e8e59c792f0285ed6c2ad33c9ad12ad30899a2519d8a10555443b69c5d6d8121
SHA512 (tailscale.com_client_tailscale_v2_@v_v2.9.0.zip) = 8b38b0533fc246a2d18df785182db5d7566db1de3f81e7af1564a03992188e553655000271abd00cb523161595af5b3e4f5b9d0ce2c823266dd26088b63af04e
Size (tailscale.com_client_tailscale_v2_@v_v2.9.0.zip) = 58407 bytes
+SHA1 (patch-cmd_tailscaled_tailscaled.go) = 49b09d743ffb3cc54679c9ca341cbfa9de881ebb
+SHA1 (patch-hostinfo_hostinfo__darwin.go) = c2cbe558a9b6ce2debefc95ab7ea3b9e783d9d8d
+SHA1 (patch-paths_paths.go) = 078e6430535d369c6a06dd1d4b8490c3ce8abeaf
+SHA1 (patch-paths_paths__unix.go) = cd42bd6efdd21f667fc6b060cec9fe9e17178650
Index: pkgsrc/net/tailscale/files/tailscaled.sh
diff -u pkgsrc/net/tailscale/files/tailscaled.sh:1.2 pkgsrc/net/tailscale/files/tailscaled.sh:1.3
--- pkgsrc/net/tailscale/files/tailscaled.sh:1.2 Fri May 15 19:57:33 2026
+++ pkgsrc/net/tailscale/files/tailscaled.sh Tue Jul 14 20:43:31 2026
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: tailscaled.sh,v 1.2 2026/05/15 19:57:33 ktnb Exp $
+# $NetBSD: tailscaled.sh,v 1.3 2026/07/14 20:43:31 schmonz Exp $
#
# PROVIDE: tailscaled
# REQUIRE: DAEMON
@@ -19,6 +19,8 @@ start_precmd="tailscaled_precmd"
start_cmd="tailscaled_start"
start_postcmd="tailscaled_poststart"
tailscaled_socket="@VARBASE@/run/tailscale/${name}.sock"
+tailscaled_statedir="@VARBASE@/db/tailscale"
+tailscaled_logfile="@VARBASE@/log/tailscale"
tailscaled_precmd()
{
@@ -26,6 +28,10 @@ tailscaled_precmd()
@MKDIR@ @VARBASE@/run/tailscale
fi
+ if [ ! -d @VARBASE@/log ]; then
+ @MKDIR@ @VARBASE@/log
+ fi
+
if [ -e ${tailscaled_socket} ]; then
@RM@ -f ${tailscaled_socket}
fi
@@ -33,7 +39,7 @@ tailscaled_precmd()
tailscaled_start()
{
- ${command} &
+ ${command} --statedir=${tailscaled_statedir} --socket=${tailscaled_socket} >>${tailscaled_logfile} 2>&1 &
}
tailscaled_poststart() {
Added files:
Index: pkgsrc/net/tailscale/patches/patch-cmd_tailscaled_tailscaled.go
diff -u /dev/null pkgsrc/net/tailscale/patches/patch-cmd_tailscaled_tailscaled.go:1.1
--- /dev/null Tue Jul 14 20:43:31 2026
+++ pkgsrc/net/tailscale/patches/patch-cmd_tailscaled_tailscaled.go Tue Jul 14 20:43:31 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmd_tailscaled_tailscaled.go,v 1.1 2026/07/14 20:43:31 schmonz Exp $
+
+Report pkgsrc as the packaging type via Hostinfo.Package.
+
+--- cmd/tailscaled/tailscaled.go.orig 2026-07-02 18:59:26.000000000 +0000
++++ cmd/tailscaled/tailscaled.go
+@@ -495,6 +495,8 @@ func run() (err error) {
+ hostinfo.SetApp(app)
+ }
+
++ hostinfo.SetPackage("pkgsrc")
++
+ return startIPNServer(context.Background(), logf, publicLogID, sys)
+ }
+
Index: pkgsrc/net/tailscale/patches/patch-hostinfo_hostinfo__darwin.go
diff -u /dev/null pkgsrc/net/tailscale/patches/patch-hostinfo_hostinfo__darwin.go:1.1
--- /dev/null Tue Jul 14 20:43:31 2026
+++ pkgsrc/net/tailscale/patches/patch-hostinfo_hostinfo__darwin.go Tue Jul 14 20:43:31 2026
@@ -0,0 +1,36 @@
+$NetBSD: patch-hostinfo_hostinfo__darwin.go,v 1.1 2026/07/14 20:43:31 schmonz Exp $
+
+Accurately report older macOS versions.
+
+--- hostinfo/hostinfo_darwin.go.orig 2026-07-02 18:59:26.000000000 +0000
++++ hostinfo/hostinfo_darwin.go
+@@ -7,7 +7,9 @@ package hostinfo
+
+ import (
+ "os"
++ "os/exec"
+ "path/filepath"
++ "strings"
+
+ "golang.org/x/sys/unix"
+ )
+@@ -27,11 +29,15 @@ func packageTypeDarwin() string {
+ return filepath.Base(exe)
+ }
+
+-// Returns the marketing version (e.g., "15.0.1" or "26.0.0")
++// Returns the marketing version (e.g., "10.9.5" or "26.0.0")
+ func osVersionDarwin() string {
+ version, err := unix.Sysctl("kern.osproductversion")
+- if err != nil {
+- return ""
++ if err == nil && version != "" {
++ return version
+ }
+- return version
++ out, err := exec.Command("sw_vers", "-productVersion").Output()
++ if err == nil {
++ return strings.TrimSpace(string(out))
++ }
++ return ""
+ }
Index: pkgsrc/net/tailscale/patches/patch-paths_paths.go
diff -u /dev/null pkgsrc/net/tailscale/patches/patch-paths_paths.go:1.1
--- /dev/null Tue Jul 14 20:43:31 2026
+++ pkgsrc/net/tailscale/patches/patch-paths_paths.go Tue Jul 14 20:43:31 2026
@@ -0,0 +1,36 @@
+$NetBSD: patch-paths_paths.go,v 1.1 2026/07/14 20:43:31 schmonz Exp $
+
+Follow hier(7).
+
+--- paths/paths.go.orig 2026-07-02 14:59:26.000000000 -0400
++++ paths/paths.go
+@@ -25,28 +25,7 @@
+ if runtime.GOOS == "windows" {
+ return `\\.\pipe\ProtectedPrefix\Administrators\Tailscale\tailscaled`
+ }
+- if runtime.GOOS == "darwin" {
+- return "/var/run/tailscaled.socket"
+- }
+- if runtime.GOOS == "plan9" {
+- return "/srv/tailscaled.sock"
+- }
+- switch distro.Get() {
+- case distro.Synology:
+- if distro.DSMVersion() == 6 {
+- return "/var/packages/Tailscale/etc/tailscaled.sock"
+- }
+- // DSM 7 (and higher? or failure to detect.)
+- return "/var/packages/Tailscale/var/tailscaled.sock"
+- case distro.Gokrazy:
+- return "/perm/tailscaled/tailscaled.sock"
+- case distro.QNAP:
+- return "/tmp/tailscale/tailscaled.sock"
+- }
+- if fi, err := os.Stat("/var/run"); err == nil && fi.IsDir() {
+- return "/var/run/tailscale/tailscaled.sock"
+- }
+- return "tailscaled.sock"
++ return "@VARBASE@/run/tailscale/tailscaled.sock"
+ }
+
+ // Overridden in init by OS-specific files.
Index: pkgsrc/net/tailscale/patches/patch-paths_paths__unix.go
diff -u /dev/null pkgsrc/net/tailscale/patches/patch-paths_paths__unix.go:1.1
--- /dev/null Tue Jul 14 20:43:31 2026
+++ pkgsrc/net/tailscale/patches/patch-paths_paths__unix.go Tue Jul 14 20:43:31 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-paths_paths__unix.go,v 1.1 2026/07/14 20:43:31 schmonz Exp $
+
+Follow hier(7).
+
+--- paths/paths_unix.go.orig 2026-07-02 18:59:26.000000000 +0000
++++ paths/paths_unix.go
+@@ -24,18 +24,7 @@ func statePath() string {
+ if runtime.GOOS == "linux" && distro.Get() == distro.JetKVM {
+ return "/userdata/tailscale/var/tailscaled.state"
+ }
+- switch runtime.GOOS {
+- case "linux", "illumos", "solaris":
+- return "/var/lib/tailscale/tailscaled.state"
+- case "freebsd", "openbsd", "netbsd":
+- return "/var/db/tailscale/tailscaled.state"
+- case "darwin":
+- return "/Library/Tailscale/tailscaled.state"
+- case "aix":
+- return "/var/tailscale/tailscaled.state"
+- default:
+- return ""
+- }
++ return "@VARBASE@/db/tailscale/tailscaled.state"
+ }
+
+ func stateFileUnix() string {
Home |
Main Index |
Thread Index |
Old Index