Remove luci-app-daed and daed ( Keep dae only )

updategeo: add sha256 checksum

Signed-off-by: Nicholas Sun <nicholas-sun@outlook.com>

Author: nicholas-opensource

…iguring-limit-of-min-and-max-value.patch …guring-max-limit-for-preferred-and.patchPATCH/odhcpd/001-config-allow-configuring-limit-of-min-and-max-value.patch renamed to PATCH/odhcpd/0001-config-allow-configuring-max-limit-for-preferred-and.patch PATCH/odhcpd/001-config-allow-configuring-limit-of-min-and-max-value.patch renamed to PATCH/odhcpd/0001-config-allow-configuring-max-limit-for-preferred-and.patch

@@ -4,22 +4,44 @@ geoip_url="https://ghproxy.com/https://github.com/Loyalsoldier/v2ray-rules-dat/r
 geoip_path="/tmp/geoip.dat"
 geosite_url="https://ghproxy.com/https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat"
 geosite_path="/tmp/geosite.dat"
+geoip_hash_url="https://ghproxy.com/https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat.sha256sum"
+geoip_hash_path="/tmp/geoip.dat.sha256sum"
+geosite_hash_url="https://ghproxy.com/https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat.sha256sum"
+geosite_hash_path="/tmp/geosite.dat.sha256sum"
 
-wget -O $geoip_path $geoip_url
-wget -O $geosite_path $geosite_url
+echo -e "\033[33mStart Downloading...... It won't take long\033[0m"
+wget -qO $geoip_path $geoip_url
+wget -qO $geosite_path $geosite_url
+wget -qO $geoip_hash_path $geoip_hash_url
+wget -qO $geosite_hash_path $geosite_hash_url
+
+local_geoip_hash=$(sha256sum $geoip_path | awk '{print $1}')
+local_geosite_hash=$(sha256sum $geosite_path | awk '{print $1}')
+github_geoip_hash=$(cat $geoip_hash_path | awk '{print $1}')
+github_geosite_hash=$(cat $geosite_hash_path | awk '{print $1}')
 
 mkdir -p /etc/dae
 
-if [ -f $geoip_path ]; then
+if [ -f $geoip_path ] && [ $local_geoip_hash = $github_geoip_hash ]; then
+    echo -e "\033[32mGeoIP sha256 check passed! Hash is $local_geoip_hash \033[0m"
     mv $geoip_path /etc/dae/geoip.dat
+    rm $geoip_hash_path
 else
-    echo "GeoIP download failed, use original file"
+    echo -e "\033[31mGeoIP download failed or sha256 mismatch, use original file\033[0m"
+    echo -e "The downloaded GeoIP hash is $local_geoip_hash , should be $github_geoip_hash"
+    rm $geoip_hash_path
+    rm $geoip_path
 fi
 
-if [ -f $geosite_path ]; then
+if [ -f $geosite_path ] && [ $local_geosite_hash = $github_geosite_hash ]; then
+    echo -e "\033[32mGeoSite sha256 check passed! Hash is $local_geosite_hash \033[0m"
     mv $geosite_path /etc/dae/geosite.dat
+    rm $geosite_hash_path
 else
-    echo "GeoSite download failed, use original file"
+    echo -e "\033[31mGeoSite download failed or sha256 mismatch, use original file\033[0m"
+    echo -e "The downloaded GeoSite hash is $local_geosite_hash , should be $github_geosite_hash"
+    rm $geosite_hash_path
+    rm $geosite_path
 fi
 
 chmod 640 /etc/dae/geoip.dat

PATCH/script/updategeo.sh

@@ -44,17 +44,15 @@ OpenWrt official v23.05.0-rc4
 
 5.Add package [dae](https://github.com/daeuniverse/dae), a high performance eBPF transparent proxy client  
 
-6.Add `luci-app-daed` to enable [daed](https://github.com/daeuniverse/daed), a modern dashboard for dae  
+6.Backport Google [BBRv3](https://www.phoronix.com/news/Google-BBRv3-Linux) TCP congestion control  
 
-7.Backport Google [BBRv3](https://www.phoronix.com/news/Google-BBRv3-Linux) TCP congestion control  
+7.Backport [LRNG](https://www.chronox.de/lrng.html) ( Linux Random Number Generator )  
 
-8.Backport [LRNG](https://www.chronox.de/lrng.html) ( Linux Random Number Generator )  
+8.Update to firewall4, firewall3 no longer supported ( Huge improvements in performance )  
 
-9.Update to firewall4, firewall3 no longer supported ( Huge improvements in performance )  
+9.Add support for phone USB hotspot sharing, both for Android and iPhone
 
-10.Add support for phone USB hotspot sharing, both for Android and iPhone
-
-11.Disable IPv6 by default
+10.Disable IPv6 by default
 
   * If you do need IPv6
 
@@ -68,7 +66,9 @@ uci set dhcp.@dnsmasq[0].filter_aaaa=0
 uci commit dhcp
 ```
   * PS: HYBRID mode is never a good choice, please learn about [IPv6](https://www.cisco.com/en/US/docs/switches/lan/catalyst3850/software/release/3se/consolidated_guide/b_consolidated_3850_3se_cg_chapter_0101011.html). Also odhcpd on OpenWrt has serious bugs!  
-  * Bug fixed: Add `dhcp.lan.max_preferred_lifetime` and `dhcp.lan.max_valid_lifetime`. And fixed `lan` IPv6 misbehaving when `wan` is getting IPv6-PD via PPPoE  
+  * Bug fixed: 
+    * Add `dhcp.lan.max_preferred_lifetime` and `dhcp.lan.max_valid_lifetime` ( Not in the LuCI )  
+    * Add scripts to fix `lan` IPv6 misbehaving when `wan` is getting IPv6-PD via PPPoE
 
 #### X86_64 Feature
 

README.md

@@ -6,8 +6,6 @@ clear
 sed -i 's/Os/O2/g' include/target.mk
 # Update feeds
 ./scripts/feeds update -a && ./scripts/feeds install -a
-# Irqbalance
-sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqbalance.config
 # Remove snapshot tags
 sed -i 's,-SNAPSHOT,,g' include/version.mk
 sed -i 's,-SNAPSHOT,,g' package/base-files/image-config.in
@@ -44,7 +42,7 @@ git clone --depth 1 https://github.com/fullcone-nat-nftables/nft-fullcone packag
 # Odhcp
 patch -p1 <../PATCH/odhcp6c/1002-odhcp6c-support-dhcpv6-hotplug.patch
 mkdir -p package/network/services/odhcpd/patches
-cp -f ../PATCH/odhcpd/001-config-allow-configuring-limit-of-min-and-max-value.patch ./package/network/services/odhcpd/patches/001-config-allow-configuring-limit-of-min-and-max-value.patch
+cp -f ../PATCH/odhcpd/0001-config-allow-configuring-max-limit-for-preferred-and.patch ./package/network/services/odhcpd/patches/0001-config-allow-configuring-max-limit-for-preferred-and.patch
 # Remove obsolete options
 sed -i 's/syn_flood/synflood_protect/g' package/network/config/firewall/files/firewall.config
 # BBRv3
@@ -99,12 +97,6 @@ ln -sf ../../../feeds/luci/applications/luci-app-autoreboot ./package/feeds/luci
 # Dae ready
 cp -rf ../immortalwrt_pkg/net/dae ./feeds/packages/net/dae
 ln -sf ../../../feeds/packages/net/dae ./package/feeds/packages/dae
-cp -rf ../immortalwrt_pkg/net/daed ./feeds/packages/net/daed
-ln -sf ../../../feeds/packages/net/daed ./package/feeds/packages/daed
-cp -rf ../immortalwrt_luci/applications/luci-app-daed ./feeds/luci/applications/luci-app-daed
-ln -sf ../../../feeds/luci/applications/luci-app-daed ./package/feeds/luci/luci-app-daed
-rm -rf ./feeds/packages/net/v2ray-geodata/Makefile
-wget https://raw.githubusercontent.com/QiuSimons/openwrt-mos/master/v2ray-geodata/Makefile -O feeds/packages/net/v2ray-geodata/Makefile
 wget -qO - https://github.com/immortalwrt/immortalwrt/commit/73e5679.patch | patch -p1
 wget https://github.com/immortalwrt/immortalwrt/raw/openwrt-23.05/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch -O target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch
 pushd feeds/packages

SCRIPTS/02_prepare_package.sh

@@ -8,4 +8,4 @@
 #
 # Change Lines
 #
-# 8 Oct
+# 11 Oct

SCRIPTS/switch

@@ -28,9 +28,6 @@ CONFIG_PACKAGE_autocore=y
 CONFIG_PACKAGE_coremark=y
 CONFIG_PACKAGE_coreutils-nohup=y
 CONFIG_PACKAGE_dae=y
-CONFIG_PACKAGE_daed=y
-CONFIG_PACKAGE_daed-geoip=y
-CONFIG_PACKAGE_daed-geosite=y
 CONFIG_PACKAGE_dnsmasq-full=y
 # CONFIG_PACKAGE_dnsmasq_full_ipset is not set
 # CONFIG_PACKAGE_dnsmasq is not set
@@ -74,7 +71,6 @@ CONFIG_PACKAGE_htop=y
 CONFIG_PACKAGE_iftop=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_luci-app-autoreboot=y
-CONFIG_PACKAGE_luci-app-daed=y
 CONFIG_PACKAGE_luci-app-opkg=y
 CONFIG_PACKAGE_luci-app-ramfree=y
 CONFIG_PACKAGE_luci-theme-bootstrap=y

SEED/R2S/config.seed

@@ -28,9 +28,6 @@ CONFIG_PACKAGE_autocore=y
 CONFIG_PACKAGE_coremark=y
 CONFIG_PACKAGE_coreutils-nohup=y
 CONFIG_PACKAGE_dae=y
-CONFIG_PACKAGE_daed=y
-CONFIG_PACKAGE_daed-geoip=y
-CONFIG_PACKAGE_daed-geosite=y
 CONFIG_PACKAGE_dnsmasq-full=y
 # CONFIG_PACKAGE_dnsmasq_full_ipset is not set
 # CONFIG_PACKAGE_dnsmasq is not set
@@ -74,7 +71,6 @@ CONFIG_PACKAGE_htop=y
 CONFIG_PACKAGE_iftop=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_luci-app-autoreboot=y
-CONFIG_PACKAGE_luci-app-daed=y
 CONFIG_PACKAGE_luci-app-opkg=y
 CONFIG_PACKAGE_luci-app-ramfree=y
 CONFIG_PACKAGE_luci-theme-bootstrap=y

SEED/R4S/config.seed

@@ -31,9 +31,6 @@ CONFIG_PACKAGE_autocore=y
 CONFIG_PACKAGE_coremark=y
 CONFIG_PACKAGE_coreutils-nohup=y
 CONFIG_PACKAGE_dae=y
-CONFIG_PACKAGE_daed=y
-CONFIG_PACKAGE_daed-geoip=y
-CONFIG_PACKAGE_daed-geosite=y
 CONFIG_PACKAGE_dnsmasq-full=y
 # CONFIG_PACKAGE_dnsmasq_full_ipset is not set
 # CONFIG_PACKAGE_dnsmasq is not set
@@ -88,7 +85,6 @@ CONFIG_PACKAGE_htop=y
 CONFIG_PACKAGE_iftop=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_luci-app-autoreboot=y
-CONFIG_PACKAGE_luci-app-daed=y
 CONFIG_PACKAGE_luci-app-opkg=y
 CONFIG_PACKAGE_luci-app-ramfree=y
 CONFIG_PACKAGE_luci-theme-bootstrap=y