fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Lean's source

Browse Source
This commit is contained in:
CN_SZTL 2020-05-26 19:35:35 +08:00
commit 248c551d79
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
12 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lean/luci-app-adbyby-plus/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 2016 Openwrt.org
# Copyright (C) 2020 Openwrt.org
#
# This is free software, licensed under the Apache License, Version 2.0 .
#
@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full
LUCI_PKGARCH:=all
PKG_NAME:=luci-app-adbyby-plus
PKG_VERSION:=2.0
PKG_RELEASE:=71
PKG_RELEASE:=72
include $(TOPDIR)/feeds/luci/luci.mk

5
package/lean/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua
View File

@ -22,6 +22,11 @@ o.title = translate("Block Apple iOS OTA update")
o.default = 0
o.rmempty = false
o = s:option(Flag, "block_douyin")
o.title = translate("Block Douyin APP and Website")
o.default = 0
o.rmempty = false
o = s:option(Flag, "cron_mode")
o.title = translate("Update the rule at 6 a.m. every morning and restart adbyby")
o.default = 0

3
package/lean/luci-app-adbyby-plus/po/zh-cn/adbyby.po
View File

@ -112,6 +112,9 @@ msgstr "手动更新规则"
msgid "Block Apple iOS OTA update"
msgstr "拦截 Apple iOS 的OTA更新"
msgid "Block Douyin APP and Website"
msgstr "拦截 抖音 APP 和网站"
msgid "RAM Running Mode"
msgstr "内存运行模式"

12
package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby
View File

@ -34,6 +34,7 @@ get_config()
config_get wan_mode $1 wan_mode 1
config_get_bool block_ios $1 block_ios 0
config_get_bool mem_mode $1 mem_mode 1
config_get_bool block_douyin $1 block_douyin 0
}
add_rules()
@ -131,6 +132,13 @@ add_dns()
echo 'conf-dir=/tmp/adbyby/rules/data' >> /tmp/dnsmasq.d/dnsmasq-adbyby.conf
[ $block_ios -eq 1 ] && echo 'address=/mesu.apple.com/0.0.0.0' >> /tmp/dnsmasq.d/dnsmasq-adbyby.conf
if [ $block_douyin -eq 1 ]; then
cat <<-EOF >/tmp/etc/dnsmasq-adbyby.d/08-dnsmasq.douyin
address=/api.amemv.com/0.0.0.0
address=/.snssdk.com/0.0.0.0
address=/.douyin.com/0.0.0.0
EOF
fi
}
del_dns()
@ -201,7 +209,7 @@ start()
add_dns
add_rule
/etc/init.d/dnsmasq reload
/etc/init.d/dnsmasq restart
fi
}
@ -213,7 +221,7 @@ stop()
del_rule
del_cron
del_dns
/etc/init.d/dnsmasq reload
/etc/init.d/dnsmasq restart
}
boot()

2
package/lean/luci-app-ipsec-vpnd/Makefile
View File

@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for IPSec VPN Server (IKEv1 with PSK and Xauth)
LUCI_DEPENDS:=+strongswan-minimal +strongswan-mod-xauth-generic
LUCI_PKGARCH:=all
PKG_VERSION:=1.0
PKG_RELEASE:=8
PKG_RELEASE:=7
include $(TOPDIR)/feeds/luci/luci.mk

2
package/lean/luci-app-ipsec-vpnd/root/etc/ipsec.include
View File

@ -2,12 +2,10 @@ iptables -D FORWARD -m policy --dir in --pol ipsec --proto esp -j ACCEPT 2>/dev
iptables -D FORWARD -m policy --dir out --pol ipsec --proto esp -j ACCEPT 2>/dev/null
iptables -D INPUT -m policy --dir in --pol ipsec --proto esp -j ACCEPT 2>/dev/null
iptables -D OUTPUT -m policy --dir out --pol ipsec --proto esp -j ACCEPT 2>/dev/null
iptables -D FORWARD -p tcp --syn -i ppp+ -j TCPMSS --set-mss 1356 2>/dev/null
iptables -I FORWARD -m policy --dir in --pol ipsec --proto esp -j ACCEPT
iptables -I FORWARD -m policy --dir out --pol ipsec --proto esp -j ACCEPT
iptables -I INPUT -m policy --dir in --pol ipsec --proto esp -j ACCEPT
iptables -I OUTPUT -m policy --dir out --pol ipsec --proto esp -j ACCEPT
iptables -I FORWARD -p tcp --syn -i ppp+ -j TCPMSS --set-mss 1356
echo 1 > /proc/sys/net/ipv4/conf/br-lan/proxy_arp

3
package/lean/luci-app-ksmbd/luasrc/model/cbi/ksmbd.lua
View File

@ -55,7 +55,10 @@ ro.enabled = "yes"
ro.disabled = "no"
fr = s:option(Flag, "force_root", translate("Force Root"))
fr.rmempty = false
fr.default = "1"
fr.enabled = "1"
fr.disabled = "0"
-- s:option(Value, "users", translate("Allowed users")).rmempty = true

4
package/lean/luci-app-unblockmusic/Makefile
View File

@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-unblockmusic
PKG_VERSION:=2.3.1
PKG_RELEASE:=42
PKG_VERSION:=2.3.5
PKG_RELEASE:=1
PKG_CONFIG_DEPENDS := \
CONFIG_UnblockNeteaseMusic_Go \

6
package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua
View File

@ -52,6 +52,12 @@ flac.rmempty = false
flac.description = translate("目前仅支持酷我、QQ、咪咕")
flac:depends("apptype", "nodejs")
force = s:option(Flag, "force_enabled", translate("强制替换为高音质歌曲"))
force.default = 1
force.rmempty = false
force.description = translate("如果歌曲音质在 320Kbps 以内，则尝试强制替换为高音质版本")
force:depends("apptype", "nodejs")
o = s:option(Flag, "autoupdate")
o.title = translate("自动检查更新主程序")
o.default = 0

9
package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
View File

@ -66,6 +66,7 @@ TYPE=$(uci_get_by_type unblockmusic musicapptype default)
AUTOUPDATE=$(uci_get_by_type unblockmusic autoupdate 0)
APPTYPE=$(uci_get_by_type unblockmusic apptype go)
FLAC=$(uci_get_by_type unblockmusic flac_enabled 0)
FORCE=$(uci_get_by_type unblockmusic force_enabled 0)
CLOUD=$(uci_get_by_type unblockmusic cloudserver "127.0.0.1:5200:5201")
cloudadd=$(echo "$CLOUD" | awk -F ':' '{print $1}')
@ -171,9 +172,13 @@ start()
if [ "$APPTYPE" == "nodejs" ]; then
if [ $FLAC -eq 1 ]; then
export ENABLE_FLAC=true
export ENABLE_FLAC=true
fi
node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200:5201 $musictype >>/tmp/unblockmusic.log 2>&1 &
if [ $FORCE -eq 1 ]; then
sed -i '/item.code != 200/ { s/item.code != 200 || item.freeTrialInfo/item.br < 320000/g; }' /usr/share/UnblockNeteaseMusic/src/hook.js
fi
node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 &
node /usr/share/UnblockNeteaseMusic/app.js -e https://music.163.com -p 5203:5201 $musictype >>/tmp/unblockmusic.log 2>&1 &
add_cron
echo "$(date -R) # UnblockNeteaseMusic Nodejs Version (http:5200, https:5201)" >>/tmp/unblockmusic.log
elif [ "$APPTYPE" == "go" ]; then

3
target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr8500-v1.c
View File

@ -9,6 +9,7 @@
*/
#include <linux/gpio.h>
#include <linux/phy.h>
#include <linux/platform_device.h>
#include <linux/proc_fs.h>
#include <linux/spi/spi_gpio.h>
@ -105,7 +106,7 @@ static struct ar8327_platform_data TL_WDR8500_v1_ar8337_data = {
static struct mdio_board_info TL_WDR8500_v1_mdio0_info[] = {
{
.bus_id = "ag71xx-mdio.0",
.phy_addr = 0,
.mdio_addr = 0,
.platform_data = &TL_WDR8500_v1_ar8337_data,
},
};

3
target/linux/ramips/image/mt7621.mk
View File

@ -936,10 +936,11 @@ define Device/xiaomi_redmi-router-ac2100
KERNEL_SIZE := 4096k
IMAGE_SIZE := 124416k
UBINIZE_OPTS := -E 5
IMAGES += kernel1.bin rootfs0.bin
IMAGES += kernel1.bin rootfs0.bin factory.bin
IMAGE/kernel1.bin := append-kernel
IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
DEVICE_VENDOR := Xiaomi
DEVICE_MODEL := Redmi Router AC2100
DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e wpad-openssl uboot-envtools