From 270814fda7c8cf4c9af0b9c4454b60a463be15f7 Mon Sep 17 00:00:00 2001
From: remittor <remittor@gmail.com>
Date: Wed, 29 Nov 2023 16:43:21 +0300
Subject: [PATCH] Add new additional package luci-app-homeproxy

---
 _addons.config |  3 +++
 _base.config   |  1 +
 _vpn.config    |  4 ++++
 xmake.sh       | 15 +++++++++++++++
 4 files changed, 23 insertions(+)

diff --git a/_addons.config b/_addons.config
index e9f31eb..4b4dd3a 100644
--- a/_addons.config
+++ b/_addons.config
@@ -45,3 +45,6 @@ CONFIG_FEED__alpine_fan_control=m
 
 ### luci-app-xray
 #GIT_PACKAGE luci-app-xray=https://github.com/yichya/luci-app-xray.git master
+
+### luci-app-homeproxy
+#GIT_PACKAGE luci-app-homeproxy=https://github.com/immortalwrt/homeproxy.git master
diff --git a/_base.config b/_base.config
index 52efb95..b0479fe 100644
--- a/_base.config
+++ b/_base.config
@@ -227,3 +227,4 @@ CONFIG_PACKAGE_luci-i18n-nlbwmon-ru=y
 #DISABLED_SVC=shadowsocks-libev
 #DISABLED_SVC=xray_core
 #DISABLED_SVC=xray
+#DISABLED_SVC=homeproxy
diff --git a/_vpn.config b/_vpn.config
index 240f002..bc3bd24 100644
--- a/_vpn.config
+++ b/_vpn.config
@@ -28,3 +28,7 @@ CONFIG_PACKAGE_kmod-nft-tproxy=y
 CONFIG_PACKAGE_luci-app-xray=y
 #CONFIG_PACKAGE_v2ray-geoip=y
 #CONFIG_PACKAGE_v2ray-geosite=y
+
+#CONFIG_PACKAGE_sing-box=y
+#CONFIG_PACKAGE_chinadns-ng=y
+CONFIG_PACKAGE_luci-app-homeproxy=y
diff --git a/xmake.sh b/xmake.sh
index ba3c04d..c082ae6 100755
--- a/xmake.sh
+++ b/xmake.sh
@@ -72,6 +72,21 @@ if [ -f $LUCI_XRAY_MK ]; then
 		sed -i 's/ +xray-core / /g' $LUCI_XRAY_MK
 	fi
 fi
+HOMEPROXY_MK=$XDIR/package/addons/luci-app-homeproxy/Makefile
+if [ -f $HOMEPROXY_MK ]; then
+	pkg_chinadns=$( get_cfg_pkg_flag $CFG chinadns-ng )
+	if [ "$pkg_chinadns" != "y" ]; then
+		# Forced disable chinadns-ng package
+		sed -i '/CONFIG_PACKAGE_chinadns-ng=/d' $CFG
+		sed -i 's/+chinadns-ng /+luci /g' $HOMEPROXY_MK
+	fi
+	pkg_sing_box=$( get_cfg_pkg_flag $CFG sing-box )
+	if [ "$pkg_sing_box" != "y" ]; then
+		# Forced disable sing-box package
+		sed -i '/CONFIG_PACKAGE_sing-box=/d' $CFG
+		sed -i 's/+sing-box /+luci /g' $HOMEPROXY_MK
+	fi
+fi
 
 make defconfig