diff --git a/brook/Makefile b/brook/Makefile index 58d339f0a..01a91b667 100644 --- a/brook/Makefile +++ b/brook/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=brook -PKG_VERSION:=20220501 +PKG_VERSION:=20220515 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/txthinking/brook/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=31474d3a9667a153986710b989d99a4f971255f407d47eebaf15b6fc9c2f4128 +PKG_HASH:=e054d0c3d0090b2015e9ff5e94a15b452a3e4e1de4588542972cc6c06965537b PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=GPL-3.0 diff --git a/luci-app-godproxy/Makefile b/luci-app-godproxy/Makefile index f3186b9d9..bad8dcf6b 100644 --- a/luci-app-godproxy/Makefile +++ b/luci-app-godproxy/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ikoolproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=20220324 +PKG_RELEASE:=20220521 PKG_MAINTAINER:=panda-mute -LUCI_TITLE:=LuCI support for koolproxy +LUCI_TITLE:=LuCI support for ikoolproxy LUCI_PKGARCH:=all LUCI_DEPENDS:=+koolproxy +openssl-util +ipset +dnsmasq-full +@BUSYBOX_CONFIG_DIFF +iptables-mod-nat-extra +wget diff --git a/luci-app-godproxy/luasrc/controller/koolproxy.lua b/luci-app-godproxy/luasrc/controller/koolproxy.lua index 750f6e171..5e430ff5e 100644 --- a/luci-app-godproxy/luasrc/controller/koolproxy.lua +++ b/luci-app-godproxy/luasrc/controller/koolproxy.lua @@ -1,11 +1,14 @@ -module("luci.controller.koolproxy",package.seeall) +module("luci.controller.koolproxy", package.seeall) function index() if not nixio.fs.access("/etc/config/koolproxy") then return end - entry({"admin", "services", "koolproxy"}, alias("admin", "services", "koolproxy", "basic"), _("iKoolProxy 滤广告"), 1).dependent = true + local page = entry({"admin", "services", "koolproxy"}, alias("admin", "services", "koolproxy", "basic"), _("iKoolProxy 滤广告"), 1) + page.dependent = true + page.acl_depends = { "luci-app-ikoolproxy" } + entry({"admin", "services", "koolproxy", "basic"}, cbi("koolproxy/basic"), _("基本设置"), 1).leaf = true entry({"admin", "services", "koolproxy", "control"}, cbi("koolproxy/control"), _("访问控制"), 2).leaf = true entry({"admin", "services", "koolproxy", "add_rule"}, cbi("koolproxy/add_rule"), _("规则订阅"), 3).leaf = true diff --git a/luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy b/luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy index 85d7f421c..5685aa444 100755 --- a/luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy +++ b/luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy @@ -5,6 +5,7 @@ uci -q batch <<-EOF >/dev/null add ucitrack koolproxy set ucitrack.@koolproxy[-1].init=koolproxy commit ucitrack + delete firewall.koolproxy set firewall.koolproxy=include set firewall.koolproxy.type=script diff --git a/luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-godproxy.json b/luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json similarity index 51% rename from luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-godproxy.json rename to luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json index a2c0003a7..daf398aff 100644 --- a/luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-godproxy.json +++ b/luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json @@ -1,6 +1,6 @@ { - "luci-app-godproxy": { - "description": "Grant UCI access for luci-app-godproxy", + "luci-app-ikoolproxy": { + "description": "Grant UCI access for luci-app-ikoolproxy", "read": { "uci": [ "koolproxy" ] }, diff --git a/luci-app-ikoolproxy/Makefile b/luci-app-ikoolproxy/Makefile index f3186b9d9..bad8dcf6b 100644 --- a/luci-app-ikoolproxy/Makefile +++ b/luci-app-ikoolproxy/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ikoolproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=20220324 +PKG_RELEASE:=20220521 PKG_MAINTAINER:=panda-mute -LUCI_TITLE:=LuCI support for koolproxy +LUCI_TITLE:=LuCI support for ikoolproxy LUCI_PKGARCH:=all LUCI_DEPENDS:=+koolproxy +openssl-util +ipset +dnsmasq-full +@BUSYBOX_CONFIG_DIFF +iptables-mod-nat-extra +wget diff --git a/luci-app-ikoolproxy/luasrc/controller/koolproxy.lua b/luci-app-ikoolproxy/luasrc/controller/koolproxy.lua index 750f6e171..5e430ff5e 100644 --- a/luci-app-ikoolproxy/luasrc/controller/koolproxy.lua +++ b/luci-app-ikoolproxy/luasrc/controller/koolproxy.lua @@ -1,11 +1,14 @@ -module("luci.controller.koolproxy",package.seeall) +module("luci.controller.koolproxy", package.seeall) function index() if not nixio.fs.access("/etc/config/koolproxy") then return end - entry({"admin", "services", "koolproxy"}, alias("admin", "services", "koolproxy", "basic"), _("iKoolProxy 滤广告"), 1).dependent = true + local page = entry({"admin", "services", "koolproxy"}, alias("admin", "services", "koolproxy", "basic"), _("iKoolProxy 滤广告"), 1) + page.dependent = true + page.acl_depends = { "luci-app-ikoolproxy" } + entry({"admin", "services", "koolproxy", "basic"}, cbi("koolproxy/basic"), _("基本设置"), 1).leaf = true entry({"admin", "services", "koolproxy", "control"}, cbi("koolproxy/control"), _("访问控制"), 2).leaf = true entry({"admin", "services", "koolproxy", "add_rule"}, cbi("koolproxy/add_rule"), _("规则订阅"), 3).leaf = true diff --git a/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy b/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy index 85d7f421c..5685aa444 100755 --- a/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy +++ b/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy @@ -5,6 +5,7 @@ uci -q batch <<-EOF >/dev/null add ucitrack koolproxy set ucitrack.@koolproxy[-1].init=koolproxy commit ucitrack + delete firewall.koolproxy set firewall.koolproxy=include set firewall.koolproxy.type=script diff --git a/my-default-settings/target/armvirt/files/etc/uci-defaults/zz-n1-default-settings b/my-default-settings/target/armvirt/files/etc/uci-defaults/zz-n1-default-settings index f78bf4fd5..66d3164f0 100644 --- a/my-default-settings/target/armvirt/files/etc/uci-defaults/zz-n1-default-settings +++ b/my-default-settings/target/armvirt/files/etc/uci-defaults/zz-n1-default-settings @@ -17,12 +17,16 @@ test -n "${hostname}" || hostname="OpenWrt" if [ "$(uci -q get wireless.${radio}.band)" = "5g" ]; then uci -q set wireless.default_${radio}.ssid="${SSID}_5G" if test -z "${htmode##HE*}"; then - uci -q set wireless.${radio}.htmode="HE160" + if [[ $htmode == "HE20" || $htmode == "HE40" ]]; then + uci -q set wireless.${radio}.htmode="HE80" + fi else uci -q set wireless.${radio}.htmode="VHT80" fi else uci -q set wireless.${radio}.htmode="HT40" + uci -q set wireless.${radio}.noscan='1' + uci -q set wireless.${radio}.vendor_vht='1' uci -q set wireless.default_${radio}.ssid="${SSID}_2.4G" fi uci -q set wireless.default_${radio}.device="${radio}" diff --git a/my-default-settings/target/ipq807x/files/etc/uci-defaults/zz-ipq-default-settings b/my-default-settings/target/ipq807x/files/etc/uci-defaults/zz-ipq-default-settings new file mode 100644 index 000000000..80a85483e --- /dev/null +++ b/my-default-settings/target/ipq807x/files/etc/uci-defaults/zz-ipq-default-settings @@ -0,0 +1,9 @@ +version=`uci -q get base_config.@status[0].version` + +test $version -lt 3 && { +uci -q del turboacc.config.sw_flow +uci commit turboacc +} + +uci -q set base_config.@status[0].version=3 +uci commit base_config