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

Merge Mainline

Browse Source
This commit is contained in:
CN_SZTL 2021-01-07 19:19:23 +08:00
commit 08b8f002bb
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/ctcgfw/openwrt-v2ray-plugin/Makefile
View File

@ -8,14 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=v2ray-plugin
PKG_VERSION:=1.7.0
PKG_VERSION:=1.8.0
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=5a8e1912a9902daa64a0aa1ea60ff367d4e806ce4443ba08b4a6e98b0d1515f0
PKG_HASH:=1276bdc2f03e40219eed2894ff746e4ef5acb8a7f980c163b7a90b0b5b9058e2
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
@ -66,9 +64,5 @@ define Build/Compile
$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/v2ray-plugin
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ray-plugin $(1)/usr/bin/v2ray-plugin
endef
$(eval $(call GoBinPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,$(PKG_NAME)))

2
package/lean/default-settings/files/zzz-default-settings
View File

@ -31,7 +31,7 @@ ln -sf /sbin/ip /usr/bin/ip
sed -i 's#https://downloads.openwrt.org#https://mirrors.cloud.tencent.com/lede#g' /etc/opkg/distfeeds.conf
sed -i '/openwrt_luci/ { s/snapshots/releases\/18.06.9/g; }' /etc/opkg/distfeeds.conf
sed -i '/openwrt_packages/ { s/snapshots/releases\/18.06.9/g; }' /etc/opkg/distfeeds.conf
sed -i '/openwrt_packages/ { s/snapshots/releases\/19.07.5/g; }' /etc/opkg/distfeeds.conf
sed -i "s/# //g" /etc/opkg/distfeeds.conf
sed -i 's/root::0:0:99999:7:::/root:$1$V4UetPzk$CYXluq4wUazHjmCDBCqXF.:0:0:99999:7:::/g' /etc/shadow

4
package/lean/v2ray/Makefile
View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=v2ray
PKG_VERSION:=4.33.0
PKG_VERSION:=4.34.0
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION)
PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=ce456df0a798e1ed76ec014cb619e89c508bfb812c689260067575ee94e18c76
PKG_HASH:=b250f569cb0369f394f63184e748f1df0c90500feb8a1bf2276257c4c8b81bee
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE

9
package/lienol/luci-app-passwall/luasrc/controller/passwall.lua
View File

@ -340,15 +340,14 @@ function server_user_status()
end
function server_user_log()
local e = {}
local id = luci.http.formvalue("id")
if nixio.fs.access("/var/etc/passwall_server/" .. id .. ".log") then
e.code = 200
local content = luci.sys.exec("cat /var/etc/passwall_server/" .. id .. ".log")
content = content:gsub("\n", "<br />")
luci.http.write(content)
else
e.code = 400
luci.http.write(string.format("<script>alert('%s');window.close();</script>", i18n.translate("Not enabled log")))
end
e.data = luci.sys.exec("cat /var/etc/passwall_server/" .. id .. ".log")
http_write_json(e)
end
function server_get_log()

2
package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua
View File

@ -12,8 +12,6 @@ s.anonymous = true
s:tab("direct_list", translate("Direct List"))
s:tab("proxy_list", translate("Proxy List"))
s:tab("proxy_list2", translate("Proxy List") .. " 2")
s:tab("proxy_list3", translate("Proxy List") .. " 3")
---- Direct Hosts
local direct_host = string.format("/usr/share/%s/rules/direct_host", appname)

23
package/lienol/luci-app-passwall/luasrc/view/passwall/server/users_list_status.htm
View File

@ -1,26 +1,5 @@
<script type="text/javascript">
//<![CDATA[
function get_log(cbi_id) {
if (cbi_id) {
XHR.get('<%=url([[admin]], [[services]], [[passwall]], [[server_user_log]])%>', {
id: cbi_id
},
function(x, result) {
if (x && x.status == 200) {
if (result.code == 200) {
var content = result.data;
content = content.replace(/\n/g, "<br />");
var new_window = window.open();
new_window.document.write(content);
} else {
alert('<%:Not enabled log%>');
}
}
}
);
}
}
var _users_status = document.getElementsByClassName('_users_status');
for(var i = 0; i < _users_status.length; i++) {
var id = _users_status[i].parentElement.parentElement.parentElement.id;
@ -45,7 +24,7 @@
var td = edit_btn[i].parentNode;
var new_div = "";
//添加"日志"按钮
new_div += '<input class="cbi-button cbi-button-add" type="button" value="<%:Log%>" onclick="get_log(\'' + id + '\')"/>&nbsp;&nbsp;';
new_div += '<input class="cbi-button cbi-button-add" type="button" value="<%:Log%>" onclick="window.open(\'' + '<%=url([[admin]], [[services]], [[passwall]], [[server_user_log]])%>' + '?id=' + id + '\', \'_blank\')"/>&nbsp;&nbsp;';
td.innerHTML = new_div + td.innerHTML;
}
catch(err) {

2
package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -1234,7 +1234,7 @@ start() {
start_redir UDP udp
start_dns
add_dnsmasq
source $APP_PATH/iptables.sh start &
source $APP_PATH/iptables.sh start
/etc/init.d/dnsmasq restart >/dev/null 2>&1
echolog "重启 dnsmasq 服务[$?]"
}

4
package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh
View File

@ -575,7 +575,7 @@ add_firewall_rule() {
}
del_firewall_rule() {
ib_nat_exist=`$ipt_n -L PREROUTING | grep -c PSW`
ib_nat_exist=$($ipt_n -nL PREROUTING | grep -c PSW)
if [ ! -z "$ib_nat_exist" ];then
until [ "$ib_nat_exist" = 0 ]
do
@ -592,7 +592,7 @@ del_firewall_rule() {
$ip6t_m -D PREROUTING -j PSW 2>/dev/null
$ip6t_m -D OUTPUT -p tcp -j PSW_OUTPUT 2>/dev/null
ib_nat_exist=`expr $ib_nat_exist - 1`
ib_nat_exist=$(expr $ib_nat_exist - 1)
done
fi
$ipt_n -F PSW 2>/dev/null && $ipt_n -X PSW 2>/dev/null

1
package/lienol/luci-app-passwall/root/usr/share/passwall/rules/proxy_host
View File

@ -62,6 +62,7 @@ gnews.org
go.com
google.com
google.com.hk
google.com.sg
google.com.tw
googleapis.com
googletagmanager.com

7
package/network/services/dropbear/files/dropbear.init
View File

@ -10,7 +10,12 @@ PROG=/usr/sbin/dropbear
NAME=dropbear
PIDCOUNT=0
extra_command "killclients" "Kill ${NAME} processes except servers and yourself"
if type extra_command 1>/dev/null 2>&1; then
extra_command "killclients" "Kill ${NAME} processes except servers and yourself"
else
EXTRA_COMMANDS="killclients"
EXTRA_HELP=" killclients Kill ${NAME} processes except servers and yourself"
fi
_dropbearkey()
{