🎉 Sync 2026-08-31 01:44:18

headscale/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=headscale
 PKG_VERSION:=0.29.3
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/juanfont/headscale/tar.gz/v$(PKG_VERSION)?
@@ -24,7 +24,7 @@ GO_PKG:=github.com/juanfont/headscale
 GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/headscale
 GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS+= \
-	-X '$(GO_PKG_BUILD_PKG)/cli.Version=v$(PKG_VERSION)'
+	-X '$(GO_PKG)/hscontrol/types.version=v$(PKG_VERSION)'
 
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
@@ -47,7 +47,7 @@ define Package/headscale/conffiles
 /etc/headscale/db.sqlite
 /etc/headscale/derp.yaml
 /etc/headscale/noise_private.key
-/etc/headscale/private.key
+/etc/headscale/derp_server_private.key
 endef
 
 define Package/headscale/install
@@ -56,6 +56,7 @@ define Package/headscale/install
 	$(INSTALL_DIR) $(1)/etc/headscale
 	touch $(1)/etc/headscale/db.sqlite
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config-example.yaml $(1)/etc/headscale/config.yaml
+	$(SED) 's#/var/lib/headscale#/etc/headscale#g' $(1)/etc/headscale/config.yaml
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/derp-example.yaml $(1)/etc/headscale/derp.yaml
 endef
 

headscale/patches/010-report-packaged-version.patch

@@ -0,0 +1,14 @@
+Allow package builds from release tarballs to provide the version because Go
+records the main module version as "(devel)" outside the module proxy. This
+keeps Headscale's database upgrade checks enabled for packaged releases.
+
+Signed-off-by: coolsnowwolf <coolsnowwolf@gmail.com>
+---
+--- a/hscontrol/types/version.go
++++ b/hscontrol/types/version.go
+@@ -24,0 +25,2 @@
++var version = "dev"
++
+@@ -45 +47 @@
+-		Version:   "dev",
++		Version:   version,