xupdate: Fix force update addons

Source: https://github.com/Slava-Shchipunov/awg-openwrt

_addons.config

@@ -42,12 +42,14 @@ CONFIG_FEED__alpine_fan_control=m
 
 
 ### AmneziaWG
-#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-24.10
+#GIT_FEED _amneziawg=https://github.com/Slava-Shchipunov/awg-openwrt.git
 CONFIG_FEED__amneziawg=m
 
 ### Zapret
-#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git
+#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git zap1
 CONFIG_FEED__zapret=m
+#GIT_FEED _zapret2=https://github.com/remittor/zapret-openwrt.git master
+CONFIG_FEED__zapret2=m
 
 ### ruantiblock
 #GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git

_base.config

@@ -162,6 +162,7 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
 #CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED=y
 #CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED=y
+CONFIG_PACKAGE_px5g-mbedtls=y
 
 ### OpenSSL lib
 CONFIG_PACKAGE_libopenssl=y
@@ -204,8 +205,8 @@ CONFIG_PACKAGE_luci-app-ddns=y
 CONFIG_PACKAGE_luci-i18n-ddns-ru=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-i18n-firewall-ru=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-i18n-opkg-ru=y
+CONFIG_PACKAGE_luci-app-package-manager=y
+CONFIG_PACKAGE_luci-i18n-package-manager-ru=y
 CONFIG_PACKAGE_luci-app-uhttpd=y
 CONFIG_PACKAGE_luci-i18n-uhttpd-ru=y
 CONFIG_PACKAGE_luci-app-upnp=y
@@ -217,6 +218,28 @@ CONFIG_PACKAGE_luci-theme-material=y
 CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 
+### Luci extensions
+CONFIG_PACKAGE_luci-full=y
+CONFIG_PACKAGE_luci-lib-uqr=y
+CONFIG_PACKAGE_luci-ssl=y
+CONFIG_PACKAGE_cgi-io=y
+CONFIG_PACKAGE_libiwinfo=y
+CONFIG_PACKAGE_libiwinfo-data=y
+CONFIG_PACKAGE_liblucihttp=y
+CONFIG_PACKAGE_liblucihttp-ucode=y
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-file=y
+CONFIG_PACKAGE_rpcd-mod-iwinfo=y
+CONFIG_PACKAGE_rpcd-mod-luci=y
+CONFIG_PACKAGE_rpcd-mod-rpcsys=y
+CONFIG_PACKAGE_rpcd-mod-rrdns=y
+CONFIG_PACKAGE_rpcd-mod-ucode=y
+CONFIG_PACKAGE_ucode-mod-html=y
+CONFIG_PACKAGE_ucode-mod-log=y
+CONFIG_PACKAGE_ucode-mod-math=y
+CONFIG_PACKAGE_uhttpd=y
+CONFIG_PACKAGE_uhttpd-mod-ubus=y
+
 ### Luci menu customizer
 CONFIG_PACKAGE_cozymenu=y
 

_base_initrd.config

@@ -77,8 +77,8 @@ CONFIG_PACKAGE_luci-mod-status=y
 CONFIG_PACKAGE_luci-mod-system=y
 CONFIG_PACKAGE_luci-app-commands=y
 CONFIG_PACKAGE_luci-i18n-commands-ru=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-i18n-opkg-ru=y
+CONFIG_PACKAGE_luci-app-package-manager=y
+CONFIG_PACKAGE_luci-i18n-package-manager-ru=y
 
 ### Luci themes
 CONFIG_PACKAGE_luci-theme-bootstrap=y

_proxy.config

@@ -13,3 +13,8 @@ CONFIG_PACKAGE_zapret-tpws=y
 CONFIG_PACKAGE_zapret-mdig=y
 CONFIG_PACKAGE_zapret-ip2net=y
 CONFIG_PACKAGE_luci-app-zapret=y
+
+CONFIG_PACKAGE_zapret2=y
+CONFIG_PACKAGE_zapret2-mdig=y
+CONFIG_PACKAGE_zapret2-ip2net=y
+CONFIG_PACKAGE_luci-app-zapret2=y

_vpn.config

@@ -24,6 +24,7 @@ CONFIG_PACKAGE_luci-proto-wireguard=y
 CONFIG_PACKAGE_kmod-amneziawg=y
 CONFIG_PACKAGE_amneziawg-tools=y
 CONFIG_PACKAGE_luci-proto-amneziawg=y
+CONFIG_PACKAGE_luci-i18n-amneziawg-ru=y
 
 CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
 CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y

kng_re.config

@@ -24,10 +24,6 @@ CONFIG_PACKAGE_hdparm=y
 CONFIG_PACKAGE_luci-app-tn-netports=y
 CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
 
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-CONFIG_PACKAGE_luci-i18n-sqm-ru=y
-
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 

r3d.config

@@ -12,7 +12,7 @@ CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=y
 #include _argon.config
 #include _vpn.config
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y

rt-ax89x.config

@@ -12,7 +12,7 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
 #include _argon.config
 #include _vpn.config
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y

rt-ax89x_initramfs.config

@@ -5,7 +5,7 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
 #include _addons.config
 #include _base_initrd.config
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 CONFIG_TARGET_INITRAMFS_FORCE=y
 CONFIG_TARGET_ROOTFS_INITRAMFS=y

xmake.sh

@@ -127,6 +127,13 @@ function build_target {
 		fi
 	fi
 
+	AWG_KMOD_MK=$XDIR/package/feeds/_amneziawg/kmod-amneziawg/Makefile
+	if [ -f $AWG_KMOD_MK ]; then
+		if grep "876bf7571e47e349d0e86b70c244330b470d9642" $AWG_KMOD_MK >/dev/null ; then
+			sed -i 's/PKG_SOURCE_VERSION:=876bf7571e47e349d0e86b70c244330b470d9642/PKG_SOURCE_VERSION:=b96e12d00112dbee9d51d18d8438aa991cec0f6a/g' $AWG_KMOD_MK
+		fi
+	fi
+
 	PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
 	if [ -f $PODKOP_MK ]; then
 		sed -i 's/+sing-box / /g' $PODKOP_MK

xupdate.sh

@@ -27,6 +27,7 @@ if [ "$OPT_FULL_UPDATE" = "true" ]; then
 	#rm -rf feeds
 	#rm -rf package/feeds
 	rm -rf staging_dir/packages
+	rm -rf feeds/_*
 	rm -rf $XADDONSDIR
 fi
 

zen-bt8.config

@@ -12,7 +12,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
 #include _argon.config
 #include _vpn.config
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y

zen-bt8_initramfs.config

@@ -2,7 +2,7 @@ CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_filogic=y
 CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 #include _addons.config
 #include _base_initrd.config