OpenWrt/kenzok8-passwall
1
0
Fork 0
mirror of https://github.com/kenzok8/openwrt-packages.git synced 2025-01-08 11:37:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2022-06-02 20:19:12

Browse Source
This commit is contained in:
github-actions[bot] 2022-06-02 20:19:12 +08:00
parent 7e7f911b26
commit aa7c18e17e
13 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ddnsto/Makefile
View File

@ -11,7 +11,7 @@ PKG_ARCH_DDNSTO:=$(ARCH)
PKG_NAME:=ddnsto
PKG_VERSION:=0.3.3
PKG_RELEASE:=2
PKG_RELEASE:=$(PKG_ARCH_DDNSTO)-2
PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://fw.koolcenter.com/binary/ddnsto/
PKG_HASH:=8a51602f8849db96d4c57dca27064ec5e68c0b7169510041500f016d354427cb
@ -29,6 +29,7 @@ define Package/$(PKG_NAME)
SUBMENU:=Web Servers/Proxies
TITLE:=DDNS.to - the reverse proxy
DEPENDS:=
PKGARCH:=all
URL:=https://www.ddnsto.com/
endef

2
luci-app-bypass/luasrc/controller/bypass.lua
View File

@ -110,7 +110,7 @@ function check_port()
luci.sys.exec(s.server..">>/a")
local dp=luci.sys.exec("netstat -unl | grep 5336 >/dev/null && echo -n 5336 || echo -n 53")
local ip=luci.sys.exec("echo "..s.server.." | grep -E \"^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$\" || \\\
nslookup "..s.server.." 127.0.0.1#"..dp.." 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E \"^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$\" | sed -n 1p")
nslookup "..s.server.." 127.0.0.1:"..dp.." 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E \"^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$\" | sed -n 1p")
ip=luci.sys.exec("echo -n "..ip)
iret=luci.sys.call("ipset add ss_spec_wan_ac "..ip.." 2>/dev/null")
socket=nixio.socket("inet","stream")

4
luci-app-bypass/root/usr/share/bypass/by-switch
View File

@ -19,11 +19,11 @@ log(){
get_ip(){
if ! echo $ip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$">/dev/null;then
r=1
while ! nslookup $ip 127.0.0.1#5336 >/dev/null 2>&1;do
while ! nslookup $ip 127.0.0.1:5336 >/dev/null 2>&1;do
[ $r -ge 10 ] && return 1 || let r++
sleep 1
done
ip=$(nslookup $ip 127.0.0.1#5336 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");i=$?
ip=$(nslookup $ip 127.0.0.1:5336 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");i=$?
ip=$(echo "$ip" | sed -n 1p)
fi
return $i

2
luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_config.lua
View File

@ -42,7 +42,7 @@ local v_ss_encrypt_method_list = {
}
local x_ss_encrypt_method_list = {
"aes-128-gcm", "aes-256-gcm", "chacha20-poly1305", "xchacha20-poly1305"
"aes-128-gcm", "aes-256-gcm", "chacha20-poly1305", "xchacha20-poly1305", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305"
}
local security_list = {"none", "auto", "aes-128-gcm", "chacha20-poly1305", "zero"}

2
luci-app-passwall2/luasrc/model/cbi/passwall2/server/user.lua
View File

@ -33,7 +33,7 @@ local v_ss_encrypt_method_list = {
}
local x_ss_encrypt_method_list = {
"aes-128-gcm", "aes-256-gcm", "chacha20-poly1305", "xchacha20-poly1305"
"aes-128-gcm", "aes-256-gcm", "chacha20-poly1305", "xchacha20-poly1305", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305"
}
local header_type_list = {

2
luci-app-store/Makefile
View File

@ -10,7 +10,7 @@ LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
LUCI_DEPENDS:=+curl +opkg +luci-base +tar +coreutils +coreutils-stat +libuci-lua +mount-utils
LUCI_PKGARCH:=all
PKG_VERSION:=0.1.9-7
PKG_VERSION:=0.1.9-8
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=

13
luci-app-store/luasrc/controller/store.lua
View File

@ -65,6 +65,15 @@ local function user_id()
return id
end
local function vue_lang()
local i18n = require("luci.i18n")
local lang = i18n.translate("istore_vue_lang")
if lang == "istore_vue_lang" or lang == "" then
lang = "en"
end
return lang
end
local function is_exec(cmd)
local nixio = require "nixio"
local os = require "os"
@ -106,11 +115,11 @@ function redirect_index()
end
function store_index()
luci.template.render("store/main", {prefix=luci.dispatcher.build_url(unpack(page_index)),id=user_id()})
luci.template.render("store/main", {prefix=luci.dispatcher.build_url(unpack(page_index)),id=user_id(),lang=vue_lang()})
end
function store_dev()
luci.template.render("store/main_dev", {prefix=luci.dispatcher.build_url(unpack({"admin", "store", "dev"})),id=user_id()})
luci.template.render("store/main_dev", {prefix=luci.dispatcher.build_url(unpack({"admin", "store", "dev"})),id=user_id(),lang=vue_lang()})
end
function store_log()

4
luci-app-store/luasrc/view/store/main.htm
View File

@ -12,11 +12,13 @@
});
window.vue_base = vue_prefix + '/';
// window.istore_api_base = "https://istore.linkease.com";
window.vue_lang_data = '/luci-static/istore/i18n/<%=lang%>.json?v=<%=id.version%>';
window.vue_lang = '<%=lang%>';
window.token = "<%=token%>";
window.device_id = {arch:"<%=id.arch%>",uid:"<%=id.uid%>",version:"<%=id.version%>"};
})();
</script>
<h2 name="content">应用商店
<h2 name="content"><%:iStore%>
<a onclick="void(0)" href="https://github.com/linkease/istore/issues/22" target="_blank" style="text-decoration: none;">
v<%=id.version%>
</a>

12
luci-app-store/src/Makefile
View File

@ -1,8 +1,20 @@
clean:
compile:
include $(TOPDIR)/rules.mk
LUCI_NAME:=luci-lib-dummy
INCLUDE_DIR:=./dummy
include $(TOPDIR)/feeds/luci/luci.mk
install:
mkdir -p "$(DESTDIR)/www/luci-static"
cp -a "$(FRONTEND_DIST)/luci-static/istore" "$(DESTDIR)/www/luci-static/"
$(SED) 's#\.js"#.js?v=$(APP_STORE_VERSION)"#g' "$(DESTDIR)/www/luci-static/istore/index.js"
mkdir -p "$(DESTDIR)/etc"
echo "$(APP_STORE_VERSION)" > "$(DESTDIR)/etc/.app_store.version"
mkdir -p "$(DESTDIR)$(LUCI_LIBRARYDIR)/i18n"
$(foreach lang,$(LUCI_LANGUAGES),$(foreach po,$(wildcard ${CURDIR}/po/$(lang)/*.po), \
po2lmo $(po) \
$(DESTDIR)$(LUCI_LIBRARYDIR)/i18n/$(basename $(notdir $(po))).$(lang).lmo;))

2
luci-app-store/src/dummy/package.mk Normal file
View File

@ -0,0 +1,2 @@
define BuildPackage
endef

8
luci-app-store/src/po/templates/iStore.pot Normal file
View File

@ -0,0 +1,8 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "istore_vue_lang"
msgstr "en"
msgid "iStore"
msgstr ""

8
luci-app-store/src/po/zh-cn/iStore.po Normal file
View File

@ -0,0 +1,8 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "istore_vue_lang"
msgstr "zh-cn"
msgid "iStore"
msgstr "应用商店"

8
luci-app-store/src/po/zh-tw/iStore.po Normal file
View File

@ -0,0 +1,8 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "istore_vue_lang"
msgstr "zh-cn"
msgid "iStore"
msgstr "应用商店"