update-11.17
This commit is contained in:
github-actions[bot]
parent
685d7ecd81
commit
b3e38aacab
|
|
@ -50,11 +50,6 @@ define Package/adguardhome/conffiles
|
|||
/etc/adguardhome.yaml
|
||||
endef
|
||||
|
||||
define Package/adguardhome/postinst
|
||||
#!/bin/sh
|
||||
/etc/init.d/AdGuardHome restart
|
||||
endef
|
||||
|
||||
define Package/adguardhome/description
|
||||
Free and open source, powerful network-wide ads and trackers blocking DNS server.
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ PKG_CONFIG_DEPENDS:= \
|
|||
|
||||
LUCI_TITLE:=SS/SSR/Xray/Trojan/Trojan-Go/NaiveProxy/Socks5/Tun LuCI interface
|
||||
LUCI_PKGARCH:=all
|
||||
LUCI_DEPENDS:=+ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +smartdns-le +coreutils +coreutils-base64 +curl +tcping +chinadns-ng +lua +luci-compat +unzip +lua-maxminddb \
|
||||
LUCI_DEPENDS:=+ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +smartdns +coreutils +coreutils-base64 +curl +tcping +chinadns-ng +lua +luci-compat +unzip +lua-maxminddb \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server:shadowsocks-libev-ss-server \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-local \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-redir \
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ end
|
|||
|
||||
function status()
|
||||
local e = {}
|
||||
e.dns_mode_status = luci.sys.call("pidof smartdns-le >/dev/null") == 0
|
||||
e.dns_mode_status = luci.sys.call("pidof smartdns >/dev/null") == 0
|
||||
e.socks5_status = luci.sys.call("ps -w | grep by- | grep socks5 | grep -v grep >/dev/null") == 0
|
||||
e.tcp_node_status = luci.sys.call("ps -w | grep by-retcp | grep -v grep >/dev/null") == 0
|
||||
e.udp_node_status = luci.sys.call("ps -w | grep by-reudp | grep -v grep >/dev/null") == 0
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ if [ "$ACTION" = ifup -a "$INTERFACE" != wan_6 ];then
|
|||
ipset -! add bypass_all $i
|
||||
done
|
||||
fi
|
||||
if pidof smartdns-le >/dev/null;then
|
||||
killall -q -9 smartdns-le
|
||||
$(which smartdns-le) -c /var/etc/smartdns/smartdns.conf
|
||||
if pidof smartdns >/dev/null;then
|
||||
killall -q -9 smartdns
|
||||
$(which smartdns) -c /var/etc/smartdns/smartdns.conf
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ gen_config_file(){
|
|||
}
|
||||
|
||||
start_dns(){
|
||||
$(which smartdns-le) -c $DNS_T
|
||||
$(which smartdns) -c $DNS_T
|
||||
case $dns_mode_o in
|
||||
doh)
|
||||
doh_o_a=$(echo $doh_o_a | sed 's/ -http-host dns.google//g')
|
||||
|
|
@ -856,7 +856,7 @@ gen_dns(){
|
|||
rm -f $O
|
||||
[ $(find $DNS_DIR -name \* -exec cat {} \; 2>/dev/null | wc -l) = 0 ] && rm -rf $DNS_DIR || echo conf-dir=$DNS_DIR >>$DNS_FILE
|
||||
[ $run_mode = router ] && chinadns_flag=1
|
||||
killall -q -9 smartdns-le
|
||||
killall -q -9 smartdns
|
||||
start_dns
|
||||
/etc/init.d/dnsmasq restart >/dev/null 2>&1
|
||||
preload
|
||||
|
|
@ -1031,7 +1031,7 @@ stop(){
|
|||
kill -9 $(ps -w | grep by-monitor | grep -v grep | awk '{print$1}') 2>/dev/null
|
||||
kill -9 $(ps -w | grep by-preload | grep -v grep | awk '{print$1}') 2>/dev/null
|
||||
kill -9 $(ps -w | grep $VAR | grep -v grep | awk '{print$1}') 2>/dev/null
|
||||
killall -q -9 smartdns-le chinadns-ng kcptun-client microsocks
|
||||
killall -q -9 smartdns chinadns-ng kcptun-client microsocks
|
||||
if [[ $adguardhome == 1 && ! "$GLOBAL_SERVER" ]]; then
|
||||
if [[ -f /etc/init.d/AdGuardHome && "$(uci -q get AdGuardHome.AdGuardHome.redirect)" == "exchange" ]]; then
|
||||
redirect="$(uci -q get AdGuardHome.AdGuardHome.old_redirect)"
|
||||
|
|
@ -1083,9 +1083,9 @@ stop(){
|
|||
dns_d_l=$(echo $dns_d_l | sed -e 's/，/,/g' -e 's/。/./g' -e 's/：/:/g' -e 's/,/\n/g')
|
||||
for i in $dns_d_l;do echo "server $i" >> $DNS_T;done
|
||||
fi
|
||||
$(which smartdns-le) -c $DNS_T
|
||||
$(which smartdns) -c $DNS_T
|
||||
r=1
|
||||
while ! ps -w | grep smartdns-le | grep -v grep >/dev/null;do
|
||||
while ! ps -w | grep smartdns | grep -v grep >/dev/null;do
|
||||
[ $r -ge 10 ] && return 1 || let r++
|
||||
sleep 1
|
||||
done
|
||||
|
|
|
|||
|
|
@ -74,11 +74,11 @@ while :;do
|
|||
fi
|
||||
#smartdns
|
||||
if [ $smartdns = 1 ];then
|
||||
t=`ps -w | grep smartdns-le | grep -v grep | wc -l`
|
||||
t=`ps -w | grep smartdns | grep -v grep | wc -l`
|
||||
if [ $t = 0 ];then
|
||||
echolog "SmartDNS Error. Restart!"
|
||||
killall -q -9 smartdns-le
|
||||
$(which smartdns-le) -c /var/etc/smartdns/smartdns.conf
|
||||
killall -q -9 smartdns
|
||||
$(which smartdns) -c /var/etc/smartdns/smartdns.conf
|
||||
fi
|
||||
fi
|
||||
#chinadns-ng
|
||||
|
|
|
|||
|
|
@ -1,50 +1,31 @@
|
|||
2021-11-16 05:51:24: ------------------- 规则更新 -----------------------
|
||||
2021-11-16 05:51:24: ====================================================
|
||||
2021-11-16 05:51:24: 开始更新koolproxy的规则，请等待...
|
||||
2021-11-16 05:51:24: ---------------------------------------------------------------------------------------
|
||||
2021-11-16 05:51:25: ---------------------------------------------------------------------------------------
|
||||
2021-11-16 05:51:26: ---------------------------------------------------------------------------------------
|
||||
2021-11-16 05:51:27: ABP规则的本地版本号： 202111160515
|
||||
2021-11-16 05:51:27: ABP规则的在线版本号： 202111160535
|
||||
2021-11-16 05:51:27: 检测到 ABP规则 已更新，现在开始更新...
|
||||
2021-11-16 05:51:27: 将临时的ABP规则文件移动到指定位置
|
||||
2021-11-16 05:51:29: Yhosts规则本地版本号： 202111082343
|
||||
2021-11-16 05:51:29: Yhosts规则在线版本号： 202111082343
|
||||
2021-11-16 05:51:29: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊!
|
||||
2021-11-16 05:51:30: Fanboy规则本地版本号：
|
||||
2021-11-16 05:51:30: Fanboy规则在线版本号： 202111160550
|
||||
2021-11-16 05:51:30: 检测到新版本 Fanboy规则 列表，开始更新...
|
||||
2021-11-16 05:51:30: 将临时文件覆盖到原始 Fanboy规则 文件
|
||||
2021-11-16 05:51:31: Antiad规则本地版本号： 20211115105634
|
||||
2021-11-16 05:51:31: Antiad规则在线版本号： 20211115105634
|
||||
2021-11-16 05:51:31: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
||||
2021-11-16 05:51:31: Banben规则本地版本号： 20211115115330
|
||||
2021-11-16 05:51:31: Banben规则在线版本号： 20211115115330
|
||||
2021-11-16 05:51:31: 检测到 Banben手机规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
||||
2021-11-16 05:51:31: StevenBlack规则本地版本号： 14 November 2021
|
||||
2021-11-16 05:51:31: StevenBlack规则在线版本号： 14 November 2021
|
||||
2021-11-16 05:51:31: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
||||
2021-11-16 05:51:31: AdAway规则本地版本号： mobile ad
|
||||
2021-11-16 05:51:31: AdAway规则在线版本号：
|
||||
2021-11-16 05:51:31: 检测到新版本 AdAway规则 列表，开始更新...
|
||||
2021-11-16 05:51:31: 将临时文件覆盖到原始 AdAway规则 文件
|
||||
2021-11-16 05:51:31: 正在优化 Fanboy规则。。。。。
|
||||
2021-11-16 05:51:32: 正在优化 ABP规则。。。。。
|
||||
2021-11-16 05:51:39: 跳过优化 补充规则Yhosts。。。。。
|
||||
2021-11-16 05:51:39: 跳过优化 补充规则Antiad。。。。。
|
||||
2021-11-16 05:51:39: 跳过优化 补充规则Banben。。。。。
|
||||
2021-11-16 05:51:39: 跳过优化 补充规则StevenBlack。。。。。
|
||||
2021-11-16 05:51:39: 正在优化 补充规则Adwars。。。。。
|
||||
2021-11-16 05:51:39: 正在优化 补充规则AdAway。。。。。
|
||||
2021-11-16 05:51:39: 所有规则更新并优化完毕！
|
||||
2021-11-16 05:51:39: ====================================================
|
||||
2021-11-16 05:51:40: -------------------ABP规则 version 202111160535
|
||||
2021-11-16 05:51:40: -------------------Fanboy规则 version 202111160550
|
||||
2021-11-16 05:51:40: -------------------Yhosts规则 version 202111082343
|
||||
2021-11-16 05:51:40: -------------------Antiad规则 version 20211115105634
|
||||
2021-11-16 05:51:40: -------------------Banben手机规则 version 20211115115330
|
||||
2021-11-16 05:51:40: -------------------StevenBlack规则 version 14 November 2021
|
||||
2021-11-16 05:51:40: -------------------静态规则 version 2021-10-07 18:00
|
||||
2021-11-16 05:51:40: -------------------乘风视频 version 202111131
|
||||
2021-11-16 05:51:40: ------------------- 内置规则更新成功！ -------------------
|
||||
2021-11-16 05:51:40: ------------------- 规则更新成功！ -------------------
|
||||
2021-11-16 23:20:28: ------------------- 规则更新 -----------------------
|
||||
2021-11-16 23:20:28: ====================================================
|
||||
2021-11-16 23:20:28: 开始更新koolproxy的规则，请等待...
|
||||
2021-11-16 23:20:28: ---------------------------------------------------------------------------------------
|
||||
2021-11-16 23:20:28: ABP规则本地版本号：
|
||||
2021-11-16 23:20:28: ABP规则在线版本号： Tue 11/16/2021
|
||||
2021-11-16 23:20:28: 检测到新版本 ABP规则 列表，开始更新...
|
||||
2021-11-16 23:20:28: 将临时文件覆盖到原始 ABP规则 文件
|
||||
2021-11-16 23:20:28: ---------------------------------------------------------------------------------------
|
||||
2021-11-16 23:20:28: Fanboy规则本地版本号： Tue 11/16/2021
|
||||
2021-11-16 23:20:28: Fanboy规则在线版本号： Tue 11/16/2021
|
||||
2021-11-16 23:20:28: 检测到 Fanboy规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
||||
2021-11-16 23:20:30: Yhosts规则本地版本号： 202111082343
|
||||
2021-11-16 23:20:30: Yhosts规则在线版本号： 202111082343
|
||||
2021-11-16 23:20:30: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊!
|
||||
2021-11-16 23:20:30: Antiad规则本地版本号： 20211117023854
|
||||
2021-11-16 23:20:30: Antiad规则在线版本号： 20211117023854
|
||||
2021-11-16 23:20:30: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
||||
2021-11-16 23:20:30: 正在优化 ABP规则。。。。。
|
||||
2021-11-16 23:20:43: 跳过优化 Fanboy规则。。。。。
|
||||
2021-11-16 23:20:43: 跳过优化 补充规则Yhosts。。。。。
|
||||
2021-11-16 23:20:43: 跳过优化 补充规则Antiad。。。。。
|
||||
2021-11-16 23:20:43: 所有规则更新并优化完毕！
|
||||
2021-11-16 23:20:43: ====================================================
|
||||
2021-11-16 23:20:45: -------------------ABP规则 version
|
||||
2021-11-16 23:20:45: -------------------Fanboy规则 version Tue 11/16/2021
|
||||
2021-11-16 23:20:45: -------------------Yhosts规则 version 202111082343
|
||||
2021-11-16 23:20:45: -------------------Antiad规则 version 20211117023854
|
||||
2021-11-16 23:20:45: -------------------静态规则 version 2021-10-07 18:00
|
||||
2021-11-16 23:20:45: ------------------- 内置规则更新成功！ -------------------
|
||||
2021-11-16 23:20:45: ------------------- 规则更新成功！ -------------------
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ end
|
|||
|
||||
function check_update()
|
||||
needs_update, notice, md5 = false, false, false
|
||||
remote_version = luci.sys.exec("curl -skfL https://op.supes.top/firmware/" ..model.. "/version.txt")
|
||||
updatelogs = luci.sys.exec("curl -skfL https://op.supes.top/firmware/" ..model.. "/updatelogs.txt")
|
||||
remote_version = luci.sys.exec("curl -skfL https://op.dllkids.xyz/firmware/" ..model.. "/version.txt")
|
||||
updatelogs = luci.sys.exec("curl -skfL https://op.dllkids.xyz/firmware/" ..model.. "/updatelogs.txt")
|
||||
remoteformat = luci.sys.exec("date -d $(echo \"" ..remote_version.. "\" | tr '\r\n' ',' | awk -F, '{printf $1}' | awk -F. '{printf $3\"-\"$1\"-\"$2}') +%s")
|
||||
fnotice = luci.sys.exec("echo \"" ..remote_version.. "\" | tr '\r\n' ',' | awk -F, '{printf $(NF-1)}'")
|
||||
dateyr = luci.sys.exec("echo \"" ..remote_version.. "\" | tr '\r\n' ',' | awk -F. '{printf $1\".\"$2}'")
|
||||
|
|
@ -35,27 +35,27 @@ function to_check()
|
|||
if model == "x86_64" then
|
||||
check_update()
|
||||
if fs.access("/sys/firmware/efi") then
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..dateyr.. "-openwrt-x86-64-generic-squashfs-combined-efi.img.gz"
|
||||
download_url = "https://op.dllkids.xyz/firmware/" ..model.. "/" ..dateyr.. "-openwrt-x86-64-generic-squashfs-combined-efi.img.gz"
|
||||
else
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..dateyr.. "-openwrt-x86-64-generic-squashfs-combined.img.gz"
|
||||
download_url = "https://op.dllkids.xyz/firmware/" ..model.. "/" ..dateyr.. "-openwrt-x86-64-generic-squashfs-combined.img.gz"
|
||||
md5 = ""
|
||||
end
|
||||
elseif model:match(".*R2S.*") then
|
||||
model = "nanopi-r2s"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..dateyr.. "-openwrt-rockchip-armv8-nanopi-r2s-squashfs-sysupgrade.img.gz"
|
||||
download_url = "https://op.dllkids.xyz/firmware/" ..model.. "/" ..dateyr.. "-openwrt-rockchip-armv8-nanopi-r2s-squashfs-sysupgrade.img.gz"
|
||||
elseif model:match(".*R4S.*") then
|
||||
model = "nanopi-r4s"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..dateyr.. "-openwrt-rockchip-armv8-nanopi-r4s-squashfs-sysupgrade.img.gz"
|
||||
download_url = "https://op.dllkids.xyz/firmware/" ..model.. "/" ..dateyr.. "-openwrt-rockchip-armv8-nanopi-r4s-squashfs-sysupgrade.img.gz"
|
||||
elseif model:match(".*R2C.*") then
|
||||
model = "nanopi-r2c"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..dateyr.. "-openwrt-rockchip-armv8-nanopi-r2c-squashfs-sysupgrade.img.gz"
|
||||
download_url = "https://op.dllkids.xyz/firmware/" ..model.. "/" ..dateyr.. "-openwrt-rockchip-armv8-nanopi-r2c-squashfs-sysupgrade.img.gz"
|
||||
elseif model:match(".*Pi 4 Model B.*") then
|
||||
model = "Rpi-4B"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..dateyr.. "-openwrt-bcm27xx-bcm2711-rpi-4-squashfs-sysupgrade.img.gz"
|
||||
download_url = "https://op.dllkids.xyz/firmware/" ..model.. "/" ..dateyr.. "-openwrt-bcm27xx-bcm2711-rpi-4-squashfs-sysupgrade.img.gz"
|
||||
else
|
||||
local needs_update = false
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<script>
|
||||
setTimeout(function(){
|
||||
var links = document.createElement('div');
|
||||
links.innerHTML ='<div class="table"><div class="tr"><div class="td left" width="33%"><a href="https://t.me/opwrts" target="_blank">TG交流(小粉红勿扰)</a></div><div class="td left" width="33%"><a href="https://github.com/kiddin9/OpenWrt_x86-r2s-r4s" target="_blank">GitHub仓库</a></div><div class="td left"><a href="http://op.supes.top/" target="_blank">固件下载</a></div></div></div>';
|
||||
links.innerHTML ='<div class="table"><div class="tr"><div class="td left" width="33%"><a href="https://t.me/joinchat/JjxmyRZZXJWb74I-sCrryA" target="_blank">TG交流</a></div><div class="td left" width="33%"><a href="https://github.com/kenzok78/Bulid_Wrt" target="_blank">GitHub仓库</a></div><div class="td left"><a href="http://op.dllkids.xyz/" target="_blank">固件下载</a></div></div></div>';
|
||||
var telegram = document.querySelectorAll(".cbi-section")[0];
|
||||
telegram.appendChild(links);
|
||||
}, 2000);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ fi
|
|||
c2=0
|
||||
c3=0
|
||||
c4=0
|
||||
while ! curl --retry 3 -m 5 https://op.supes.top >/dev/null 2>&1;do
|
||||
while ! curl --retry 3 -m 5 https://op.dllkids.xyz >/dev/null 2>&1;do
|
||||
echo "无法连接仓库服务器,请检查网络. $c1" | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log
|
||||
[ $c1 eq 120 ] && return || let c1++
|
||||
sleep 5
|
||||
|
|
|
|||
|
|
@ -1,21 +1,30 @@
|
|||
luci-app-netdata for OpenWRT/Lede(ÖÐÎÄ)
|
||||
luci-app-netdata for OpenWRT/Lede
|
||||
|
||||
|
||||
Install to OpenWRT/LEDE
|
||||
|
||||
git clone https://github.com/sirpdboy/luci-app-netdata
|
||||
|
||||
cp -r luci-app-netdata LEDE_DIR/package/luci-app-netdata
|
||||
|
||||
cd LEDE_DIR
|
||||
|
||||
./scripts/feeds update -a
|
||||
|
||||
./scripts/feeds install -a
|
||||
|
||||
make menuconfig
|
||||
|
||||
LuCI --->
|
||||
|
||||
1. Collections --->
|
||||
|
||||
<*> luci
|
||||
|
||||
3. Applications --->
|
||||
|
||||
<*> luci-app-netdata.........................LuCI support for Netdata
|
||||
|
||||
|
||||
make package/new/luci-app-netdata/compile V=s
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=smartdns-le
|
||||
PKG_VERSION:=2021.07.30
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git
|
||||
PKG_SOURCE_VERSION:=a5887932218d007415dfee435c41f3b25a25bd97
|
||||
|
||||
PKG_MAINTAINER:=Nick Peng <pymumu@gmail.com>
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
MAKE_VARS += VER=$(PKG_VERSION)
|
||||
MAKE_PATH:=src
|
||||
|
||||
define Package/smartdns-le
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
TITLE:=smartdns server
|
||||
DEPENDS:=+libc +libpthread +libopenssl
|
||||
URL:=https://www.github.com/pymumu/smartdns/
|
||||
endef
|
||||
|
||||
define Package/smartdns-le/description
|
||||
SmartDNS is a local DNS server which accepts DNS query requests from local network clients,
|
||||
gets DNS query results from multiple upstream DNS servers concurrently, and returns the fastest IP to clients.
|
||||
Unlike dnsmasq's all-servers, smartdns returns the fastest IP.
|
||||
endef
|
||||
|
||||
define Package/smartdns-le/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/smartdns $(1)/usr/sbin/smartdns-le
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,smartdns-le))
|
||||
Loading…
Reference in New Issue