From 013d2f1f50641f7340967dae52a39bf986a11fa2 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Mon, 22 Nov 2021 15:46:26 +0800 Subject: [PATCH] int --- diy/patches/AdGuardHome.patch | 44 +++++++++++++------- diy/patches/acl.patch | 0 diy/patches/cgroupfs-mount.patch | 0 diy/patches/dockerman_qinglong.patch | 44 -------------------- diy/patches/https-dns-proxy.patch | 61 ---------------------------- diy/patches/luci-app-cifs.patch | 0 diy/patches/luci-app-mentohust.patch | 0 diy/patches/luci-app-wizard.patch | 22 ---------- diy/patches/miniupnp.patch | 0 diy/patches/mtwifi.patch | 0 diy/patches/netspeedtest.patch | 54 ------------------------ diy/patches/openvpn.patch | 0 diy/patches/pdnsd-filter-aaaa.patch | 0 diy/patches/qbittorrent.patch | 0 14 files changed, 30 insertions(+), 195 deletions(-) mode change 100755 => 100644 diy/patches/AdGuardHome.patch mode change 100755 => 100644 diy/patches/acl.patch mode change 100755 => 100644 diy/patches/cgroupfs-mount.patch delete mode 100755 diy/patches/dockerman_qinglong.patch delete mode 100755 diy/patches/https-dns-proxy.patch mode change 100755 => 100644 diy/patches/luci-app-cifs.patch mode change 100755 => 100644 diy/patches/luci-app-mentohust.patch delete mode 100755 diy/patches/luci-app-wizard.patch mode change 100755 => 100644 diy/patches/miniupnp.patch mode change 100755 => 100644 diy/patches/mtwifi.patch delete mode 100755 diy/patches/netspeedtest.patch mode change 100755 => 100644 diy/patches/openvpn.patch mode change 100755 => 100644 diy/patches/pdnsd-filter-aaaa.patch mode change 100755 => 100644 diy/patches/qbittorrent.patch diff --git a/diy/patches/AdGuardHome.patch b/diy/patches/AdGuardHome.patch old mode 100755 new mode 100644 index 0f956b325..5da7c088d --- a/diy/patches/AdGuardHome.patch +++ b/diy/patches/AdGuardHome.patch @@ -9,14 +9,24 @@ done uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null uci set dhcp.@dnsmasq[0].noresolv=1 -@@ -499,6 +499,14 @@ start_service() { +@@ -274,6 +274,7 @@ _do_redirect() + elif [ "$redirect" == "exchange" -a "$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)" == "53" ]; then + use_port53 + fi ++ /etc/init.d/dnsmasq restart + } + + get_filesystem() +@@ -499,12 +500,23 @@ start_service() { echo "AdGuardHome service enabled" echo "luci enable switch=$enabled" (sleep 10 && [ -z "$(pgrep $binpath)" ] && logger "AdGuardHome" "no process in 10s cancel redirect" && _do_redirect 0 )& + if [[ "`uci get bypass.@global[0].global_server 2>/dev/null`" && "`uci get bypass.@global[0].adguardhome 2>/dev/null`" == 1 && "$(uci get dhcp.@dnsmasq[0].port)" == "53" ]]; then + c1=0 + while ! netstat -tunlp | grep 53 | grep -i AdGuardHome 2>&1; do -+ /etc/init.d/bypass restart 2>/dev/null ++ uci -q set AdGuardHome.AdGuardHome.redirect='exchange' ++ uci commit AdGuardHome ++ /etc/init.d/AdGuardHome restart + sleep 1 + [ $c1 == 5 ] && break || let c1++ + done @@ -24,7 +34,14 @@ } reload_service() -@@ -539,11 +548,13 @@ stop_service() + { + rm /var/run/AdGlucitest >/dev/null 2>&1 + echo "AdGuardHome reloading" ++ stop + start + } + +@@ -539,11 +551,13 @@ stop_service() fi echo "AdGuardHome service disabled" touch /var/run/AdGserverdis @@ -51,18 +68,17 @@ $(AGH_VERSION_PKG).buildtime=$(AGH_BUILD_TIME) \ $(AGH_VERSION_PKG).goarm=$(GO_ARM) \ $(AGH_VERSION_PKG).gomips=$(GO_MIPS) -@@ -52,6 +52,11 @@ define Package/adguardhome/conffiles - /etc/adguardhome.yaml - endef - -+define Package/adguardhome/postinst -+#!/bin/sh + +--- a/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome ++++ b/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome +@@ -6,6 +6,7 @@ uci -q batch <<-EOF >/dev/null 2>&1 + set ucitrack.@AdGuardHome[-1].init=AdGuardHome + commit ucitrack + delete AdGuardHome.AdGuardHome.ucitracktest + /etc/init.d/AdGuardHome restart -+endef -+ - define Package/adguardhome/description - Free and open source, powerful network-wide ads and trackers blocking DNS server. - endef + EOF + + rm -f /tmp/luci-indexcache --- a/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt +++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt diff --git a/diy/patches/acl.patch b/diy/patches/acl.patch old mode 100755 new mode 100644 diff --git a/diy/patches/cgroupfs-mount.patch b/diy/patches/cgroupfs-mount.patch old mode 100755 new mode 100644 diff --git a/diy/patches/dockerman_qinglong.patch b/diy/patches/dockerman_qinglong.patch deleted file mode 100755 index 3bfa7206e..000000000 --- a/diy/patches/dockerman_qinglong.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/luci-app-dockerman/Makefile -+++ b/luci-app-dockerman/Makefile -@@ -7,6 +7,7 @@ LUCI_DEPENDS:=@(aarch64||arm||x86_64) \ - +luci-lib-ip \ - +docker \ - +dockerd \ -+ +cgroupfs-mount \ - +ttyd - LUCI_PKGARCH:=all - - ---- a/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm -+++ b/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm -@@ -88,12 +88,29 @@ - } - - function show_reslov_dialog() { -- document.getElementById('dialog_reslov') || document.body.insertAdjacentHTML("beforeend", '
<%:Plese input command line:%>
') -+ document.getElementById('dialog_reslov') || document.body.insertAdjacentHTML("beforeend", '
<%:Plese input command line:%>
青龙京豆
') - document.body.classList.add('dialog-reslov-active') - let s = document.getElementById('cmd-line-status') - s.innerHTML = "" - document.documentElement.style.overflowY = 'hidden' - } -+ function writeInto(){ -+ var t = document.getElementById("dialog_reslov_text"); -+ t.value = "docker run -dit \ -+ -v /opt/ql/config:/ql/config \ -+ -v /opt/ql/db:/ql/db \ -+ -v /opt/ql/scripts:/ql/scripts \ -+ -v /opt/ql/log:/ql/log \ -+ -v /opt/ql/repo:/ql/repo \ -+ -v /opt/ql/jbot:/ql/jbot \ -+ -v /opt/ql/ninja:/ql/ninja \ -+ -p 5700:5700 \ -+ -p 5701:5701 \ -+ --name qinglong \ -+ --hostname qinglong \ -+ --restart always \ -+ whyour/qinglong:latest"; -+} - - <%+cbi/valueheader%> - diff --git a/diy/patches/https-dns-proxy.patch b/diy/patches/https-dns-proxy.patch deleted file mode 100755 index 53766b1ea..000000000 --- a/diy/patches/https-dns-proxy.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua -+++ b/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua -@@ -109,12 +109,10 @@ h.template = "cbi/nullsection" - ss = h:option(DummyValue, "_dummy", translate("Service Status")) - ss.template = packageName .. "/status" - ss.value = packageStatus --if packageStatusCode ~= -1 then -- buttons = h:option(DummyValue, "_dummy", translate("Service Control")) -- buttons.template = packageName .. "/buttons" --end - - c = m:section(NamedSection, "config", "https-dns-proxy", translate("Configuration")) -+o = c:option(Flag, "enabled", translate("Enable")) -+o.default = 1 - d1 = c:option(ListValue, "update_dnsmasq_config", translate("Update DNSMASQ Config on Start/Stop"), translatef("If update option is selected, the 'DNS forwardings' section of %sDHCP and DNS%s will be automatically updated to use selected DoH providers (%smore information%s).", "", "", "", "")) - d1:value('*', translate("Update all configs")) - local dnsmasq_num = 0 - ---- a/https-dns-proxy/files/https-dns-proxy.init -+++ b/https-dns-proxy/files/https-dns-proxy.init -@@ -96,6 +96,8 @@ is_force_dns_active() { iptables-save | grep -q -w -- '--dport 53'; } - start_service() { - local p=5053 c - config_load 'https-dns-proxy' -+ config_get enabled 'config' 'enabled' '1' -+ [ "$enabled" = 0 ] && return - config_get dnsmasqConfig 'config' 'update_dnsmasq_config' '*' - config_get_bool forceDNS 'config' 'force_dns' '1' - config_get forceDNSPorts 'config' 'force_dns_port' '53 853' -@@ -152,7 +154,7 @@ stop_service() { - } - - service_triggers() { -- procd_add_config_trigger "config.change" "https-dns-proxy" /etc/init.d/https-dns-proxy reload -+ procd_add_config_trigger "config.change" "https-dns-proxy" /etc/init.d/https-dns-proxy restart - } - - service_started() { procd_set_config_changed firewall; } -@@ -203,8 +205,8 @@ dnsmasq_restore_server_backup() { - fi - uci -q del "dhcp.${cfg}.doh_backup_noresolv" - fi -+ uci -q del "dhcp.${cfg}.server" - if uci -q get "dhcp.${cfg}.doh_backup_server" >/dev/null; then -- uci -q del "dhcp.${cfg}.server" - for i in $(uci -q get "dhcp.${cfg}.doh_backup_server"); do - uci -q add_list "dhcp.${cfg}.server=$i" - done - ---- a/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy -+++ b/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy -@@ -1,3 +1,9 @@ - #!/bin/sh -+uci -q batch <<-EOF >/dev/null -+ delete ucitrack.@https-dns-proxy[-1] -+ add ucitrack https-dns-proxy -+ set ucitrack.@https-dns-proxy[-1].init=https-dns-proxy -+ commit ucitrack -+EOF - rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache; - exit 0 diff --git a/diy/patches/luci-app-cifs.patch b/diy/patches/luci-app-cifs.patch old mode 100755 new mode 100644 diff --git a/diy/patches/luci-app-mentohust.patch b/diy/patches/luci-app-mentohust.patch old mode 100755 new mode 100644 diff --git a/diy/patches/luci-app-wizard.patch b/diy/patches/luci-app-wizard.patch deleted file mode 100755 index ef77e14a6..000000000 --- a/diy/patches/luci-app-wizard.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/luci-app-wizard/root/usr/share/luci/menu.d/luci-app-wizard.json -+++ b/luci-app-wizard/root/usr/share/luci/menu.d/luci-app-wizard.json -@@ -1,7 +1,7 @@ - { -- "admin/initsetup": { -+ "admin/network/initsetup": { - "title": "Wizard", -- "order": 990, -+ "order": 30, - "action": { - "type": "view", - "path": "wizard/wizard" - ---- a/luci-app-wizard/root/etc/config/wizard -+++ b/luci-app-wizard/root/etc/config/wizard -@@ -1,5 +1,5 @@ - config wizard 'default' -- option lan_ipaddr '192.168.15.1' -+ option lan_ipaddr '' - option lan_netmask '255.255.255.0' - option wan_proto 'dhcp' - option wan_ipaddr '' diff --git a/diy/patches/miniupnp.patch b/diy/patches/miniupnp.patch old mode 100755 new mode 100644 diff --git a/diy/patches/mtwifi.patch b/diy/patches/mtwifi.patch old mode 100755 new mode 100644 diff --git a/diy/patches/netspeedtest.patch b/diy/patches/netspeedtest.patch deleted file mode 100755 index 754a41576..000000000 --- a/diy/patches/netspeedtest.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/luci-app-netspeedtest/Makefile -+++ b/luci-app-netspeedtest/Makefile -@@ -19,25 +19,15 @@ define Package/$(PKG_NAME) - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=LuCI Support for netspeedtest -- DEPENDS:=+python3 +iperf3 -- DESCRIPTION:=LuCI support Network speed test intranet and Extranet -- PKGARCH:=all --endef -- --define Package/$(PKG_NAME)/description -- Luci Support for netspeedtest. --endef -- --define Build/Prepare -- $(foreach po,$(wildcard ${CURDIR}/po/zh-cn/*.po), \ -- po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));) -+ PKGARCH:=all -+ DEPENDS:=+python3 +iperf3 - endef - - define Build/Compile - endef - - define Package/$(PKG_NAME)/conffiles --/etc/config/netspeedtest -+ /etc/config/netspeedtest - endef - - define Package/$(PKG_NAME)/install -@@ -46,10 +36,7 @@ define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/ - cp -pR ./root/* $(1)/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/netspeedtest.lmo $(1)/usr/lib/lua/luci/i18n/ -+ po2lmo ./po/zh-cn/netspeedtest.po $(1)/usr/lib/lua/luci/i18n/netspeedtest.zh-cn.lmo - endef - --include $(TOPDIR)/feeds/luci/luci.mk -- --# call BuildPackage - OpenWrt buildroot signature -- -+$(eval $(call BuildPackage,$(PKG_NAME))) - -diff --git a/luci-app-netspeedtest/root/etc/init.d/netspeedtest b/luci-app-netspeedtest/root/etc/init.d/netspeedtest -old mode 100644 -new mode 100755 -diff --git a/luci-app-netspeedtest/root/etc/init.d/speedtest b/luci-app-netspeedtest/root/etc/init.d/speedtest -old mode 100644 -new mode 100755 -diff --git a/luci-app-netspeedtest/root/etc/uci-defaults/40_luci-app-netspeedtest b/luci-app-netspeedtest/root/etc/uci-defaults/40_luci-app-netspeedtest -old mode 100644 -new mode 100755 diff --git a/diy/patches/openvpn.patch b/diy/patches/openvpn.patch old mode 100755 new mode 100644 diff --git a/diy/patches/pdnsd-filter-aaaa.patch b/diy/patches/pdnsd-filter-aaaa.patch old mode 100755 new mode 100644 diff --git a/diy/patches/qbittorrent.patch b/diy/patches/qbittorrent.patch old mode 100755 new mode 100644