update 2022-08-07 20:18:22

luci-app-amlogic/Makefile

@@ -16,7 +16,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.111
+PKG_VERSION:=3.1.112
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0 License

luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_config.lua

@@ -62,8 +62,6 @@ kernel_branch.description = translate("Set the version branch of the openwrt fir
 kernel_branch:value("5.4", translate("5.4"))
 kernel_branch:value("5.10", translate("5.10"))
 kernel_branch:value("5.15", translate("5.15"))
-kernel_branch:value("5.16", translate("5.16"))
-kernel_branch:value("5.17", translate("5.17"))
 kernel_branch:value("5.18", translate("5.18"))
 kernel_branch:value("5.19", translate("5.19"))
 local default_kernel_branch = luci.sys.exec("ls /lib/modules/ 2>/dev/null | grep -oE '^[1-9].[0-9]{1,3}'")

luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh

@@ -173,7 +173,7 @@ check_updated() {
     if [[ -n "${api_op_down_line}" && -n "$(echo ${api_op_down_line} | sed -n "/^[0-9]\+$/p")" ]]; then
         tolog '<input type="button" class="cbi-button cbi-button-reload" value="Download" onclick="return b_check_firmware(this, '"'download_${api_op_down_line}_${latest_updated_at}'"')"/> Latest updated: '${latest_updated_at_format}'' "1"
     else
-        tolog "02.02 No firmware available." "1"
+        tolog "02.02 No firmware available, please use another kernel branch." "1"
     fi
 
     exit 0

luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh

@@ -172,7 +172,7 @@ check_kernel() {
 
     latest_version="$(cat ${github_api_kernel_library} | grep "name" | grep -oE "${main_line_version}.[0-9]+" | sed -e "s/${main_line_version}.//g" | sort -n | sed -n '$p')"
     #latest_version="124"
-    [[ -n "${latest_version}" ]] || tolog "02.03 Failed to get the version on the server." "1"
+    [[ -n "${latest_version}" ]] || tolog "02.03 No kernel available, please use another kernel branch." "1"
     tolog "02.03 current version: ${current_kernel_v}, Latest version: ${main_line_version}.${latest_version}"
     sleep 2
 

luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh

@@ -101,7 +101,7 @@ curl -s "https://api.github.com/repos/ophub/luci-app-amlogic/releases" >${github
 sleep 1
 
 server_plugin_version="$(cat ${github_api_plugin} | grep "tag_name" | awk -F '"' '{print $4}' | tr " " "\n" | sort -rV | head -n 1)"
-[[ -n "${server_plugin_version}" ]] || tolog "02.01 Failed to get the version on the server." "1"
+[[ -n "${server_plugin_version}" ]] || tolog "02.01 Query failed, please try again." "1"
 tolog "02.01 current version: ${current_plugin_v}, Latest version: ${server_plugin_version}"
 sleep 2
 

luci-app-xray/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-xray
-PKG_VERSION:=1.15.0
+PKG_VERSION:=1.15.1
 PKG_RELEASE:=1
 
 PKG_LICENSE:=MPLv2

luci-app-xray/README.md

@@ -51,6 +51,7 @@ Focus on making the most of Xray (HTTP/HTTPS/Socks/TProxy inbounds, multiple pro
 * 2022-06-05 feat: shadowsocks-2022 UDP over TCP support
 * 2022-06-14 feat: multiple geoip direct code
 * 2022-06-19 feat: skip proxy for specific uids / gids (nftables support only)
+* 2022-08-07 fix: avoid duplicated items in generated nftables ruleset
 
 ## Changelog 2021
 

luci-app-xray/root/usr/share/xray/firewall_include.uc

@@ -5,14 +5,16 @@
     cursor.load("xray");
     const config = cursor.get_all("xray");
     const general = config[filter(keys(config), k => config[k][".type"] == "general")[0]];
-    const tp_spec_src_fw = map(filter(keys(config), k => config[k][".type"] == "lan_hosts" && config[k].bypassed == "0"), k => config[k].macaddr) || [];
-    const tp_spec_src_bp = map(filter(keys(config), k => config[k][".type"] == "lan_hosts" && config[k].bypassed == "1"), k => config[k].macaddr) || [];
-    const uids_direct = general.uids_direct || [];
-    const gids_direct = general.gids_direct || [];
-    let wan_bp_ips = general.wan_bp_ips || [];
-    let wan_fw_ips = general.wan_fw_ips || [];
-    push(wan_bp_ips, split(general.fast_dns, ":")[0]);
-    push(wan_fw_ips, split(general.secure_dns, ":")[0]);
+    const tp_spec_src_fw = uniq(map(filter(keys(config), k => config[k][".type"] == "lan_hosts" && config[k].bypassed == "0"), k => config[k].macaddr) || []);
+    const tp_spec_src_bp = uniq(map(filter(keys(config), k => config[k][".type"] == "lan_hosts" && config[k].bypassed == "1"), k => config[k].macaddr) || []);
+    const uids_direct = uniq(general.uids_direct || []);
+    const gids_direct = uniq(general.gids_direct || []);
+    let wan_bp_ips_no_dns = general.wan_bp_ips || [];
+    let wan_fw_ips_no_dns = general.wan_fw_ips || [];
+    push(wan_bp_ips_no_dns, split(general.fast_dns, ":")[0]);
+    push(wan_fw_ips_no_dns, split(general.secure_dns, ":")[0]);
+    const wan_bp_ips = uniq(wan_bp_ips_no_dns);
+    const wan_fw_ips = uniq(wan_fw_ips_no_dns);
 %}
     set tp_spec_src_ac {
         type ether_addr

my-default-settings/files/etc/uci-defaults/99-default-settings

@@ -127,7 +127,8 @@ if [[ ! "$version" || "$version" -lt 1 ]]; then
 	grep -q log-facility /etc/dnsmasq.conf ||
 		echo "log-facility=/dev/null" >> /etc/dnsmasq.conf
 
-	if [[ -f /sys/module/xt_FULLCONENAT/refcnt || -f /sys/module/nft_fullcone/refcnt ]]; then
+	kernel_version="$(echo -n $(uname -r))"
+	if [[ -f /lib/modules/$kernel_version/xt_FULLCONENAT.ko || -f /lib/modules/$kernel_version/nft_fullcone.ko ]]; then
 	uci -q set firewall.@defaults[0].fullcone='1'
 	uci commit firewall
 	fi

smartdns/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=smartdns
-PKG_VERSION:=36.1
+PKG_VERSION:=37
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/pymumu/smartdns/tar.gz/Release$(PKG_VERSION)?
-PKG_HASH:=92bba606295869ecdced2c1f0939baa90a9838e554a7f63208da988432769e6f
+PKG_HASH:=87ddd578d5157e0de06a0e76eaf3c2715d786f6461dba70fd721b6d5cf712b71
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-Release$(PKG_VERSION)
 
 PKG_MAINTAINER:=Nick Peng <pymumu@gmail.com>