From e48c794b7620f70eba2650b21a40f379870d25fa Mon Sep 17 00:00:00 2001
From: hayzam <hayzam@gmail.com>
Date: Wed, 6 Nov 2024 11:26:53 +0400
Subject: [PATCH] tailscale, adguardhome: update

---
 net/adguardhome/Makefile                 | 4 ++--
 net/adguardhome/files/adguardhome.config | 1 +
 net/adguardhome/files/adguardhome.init   | 3 ++-
 net/tailscale/Makefile                   | 9 +++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile
index 4c79d1465..4b7bd1b2c 100644
--- a/net/adguardhome/Makefile
+++ b/net/adguardhome/Makefile
@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.51
+PKG_VERSION:=0.107.53
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome
-PKG_MIRROR_HASH:=2a0f13656aae4504a5966efe5295507a60e506d308efaa1c902d5c6bb9c2e527
+PKG_MIRROR_HASH:=d74702bc4f8b82bda64a0a937a98e73ee602c21b9361c0c683671212e03e9316
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE.txt
diff --git a/net/adguardhome/files/adguardhome.config b/net/adguardhome/files/adguardhome.config
index 9f4934875..0c2aeac0a 100644
--- a/net/adguardhome/files/adguardhome.config
+++ b/net/adguardhome/files/adguardhome.config
@@ -1,3 +1,4 @@
 config adguardhome config
 	# Where to store persistent data by AdGuard Home
 	option workdir /var/adguardhome
+	option config /etc/adguardhome.yaml
diff --git a/net/adguardhome/files/adguardhome.init b/net/adguardhome/files/adguardhome.init
index 6a29c4e4a..ffdae9c43 100644
--- a/net/adguardhome/files/adguardhome.init
+++ b/net/adguardhome/files/adguardhome.init
@@ -22,11 +22,12 @@ start_service() {
 
   config_load adguardhome
   config_get WORK_DIR config workdir
+  config_get CONFIG_FILE config config "/etc/adguardhome.yaml"
 
   [ -d "$WORK_DIR" ] || mkdir -m 0755 -p "$WORK_DIR"
 
   procd_open_instance
-  procd_set_param command "$PROG" -c /etc/adguardhome.yaml -w "$WORK_DIR" --no-check-update
+  procd_set_param command "$PROG" -c "$CONFIG_FILE" -w "$WORK_DIR" --no-check-update
   procd_set_param stdout 1
   procd_set_param stderr 1
   procd_close_instance
diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile
index 5bd7a5c07..00d891b90 100644
--- a/net/tailscale/Makefile
+++ b/net/tailscale/Makefile
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tailscale
-PKG_VERSION:=1.66.4
+PKG_VERSION:=1.76.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=db94df254a263110439aa9d6cf6e1e64a5644b6e6e459ab5298ba6e478a988cf
+PKG_HASH:=1cc2ef1b7b6491c48446ec4c20c413c2300e8b7e171b119d843af46d0ce3125f
 
-PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
+PKG_MAINTAINER:=Zephyr Lykos <self@mochaa.ws>, \
+		Sandro Jäckel <sandro.jaeckel@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
@@ -28,7 +29,7 @@ GO_PKG:=\
 	tailscale.com/cmd/tailscaled
 GO_PKG_LDFLAGS:=-X 'tailscale.com/version.longStamp=$(PKG_VERSION)-$(PKG_RELEASE) (OpenWrt)'
 GO_PKG_LDFLAGS_X:=tailscale.com/version.shortStamp=$(PKG_VERSION)
-GO_PKG_TAGS:=ts_include_cli
+GO_PKG_TAGS:=ts_include_cli,ts_omit_aws,ts_omit_bird,ts_omit_tap,ts_omit_kube,ts_omit_completion
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk