update 2022-12-13 20:19:18

This commit is contained in:
github-actions[bot] 2022-12-13 20:19:18 +08:00
parent 4df3e776b6
commit 11578de198
11 changed files with 19 additions and 27 deletions

View File

@ -8,8 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lucky
PKG_VERSION:=1.6.2
PKG_RELEASE:=4
PKG_VERSION:=1.7.2
PKG_RELEASE:=1
PKGARCH:=all
ifeq ($(ARCH),mipsel)
LUCKY_ARCH:=mipsle_softfloat

View File

@ -11,7 +11,7 @@
USE_PROCD=1
START=99
STOP=10
STOP=15
CONF=lucky
PROG=/usr/bin/lucky
@ -26,13 +26,13 @@ get_config() {
}
set_firewall() {
if [ "$AllowInternetaccess" = "1" ]; then
if [ "x$AllowInternetaccess" == "x1" ]; then
uci -q delete firewall.lucky
uci set firewall.lucky=rule
uci set firewall.lucky.name="lucky"
uci set firewall.lucky.target="ACCEPT"
uci set firewall.lucky.src="wan"
uci set firewall.lucky.proto="tcp"
uci set firewall.lucky.proto='tcp udp'
uci set firewall.lucky.dest_port="$port"
uci set firewall.lucky.enabled="1"
uci commit firewall
@ -62,7 +62,7 @@ EOF
else
sed -i 's/"AllowInternetaccess": true,/"AllowInternetaccess": false,/g' "$LUCKYCONF"
fi
set_firewall
# set_firewall
procd_open_instance
procd_set_param command "$PROG"
procd_append_param command -c "$LUCKYCONF" -p $port

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-xray
PKG_VERSION:=1.23.2
PKG_VERSION:=1.23.3
PKG_RELEASE:=1
PKG_LICENSE:=MPLv2

View File

@ -51,6 +51,7 @@ Focus on making the most of Xray (HTTP/HTTPS/Socks/TProxy inbounds, multiple pro
* 2022-10-06 `[OpenWrt 22.03 or above only]` feat: use goto instead of jump in nftables rules
* 2022-10-29 `[OpenWrt 22.03 or above only]` feat: rewrite gen_config in ucode
* 2022-11-01 feat: support xtls-rprx-vision
* 2022-12-13 fix: force restart dnsmasq on interface change
## Changelog 2021

View File

@ -7,6 +7,7 @@ if [ -n "$DEFAULT_GATEWAY" ] ; then
flush tp_spec_def_gw
add tp_spec_def_gw $DEFAULT_GATEWAY
EOF
service dnsmasq restart
else
logger -st transparent-proxy-ipset[$$] -p6 "default gateway not available, please wait for interface ready"
fi

View File

@ -7,6 +7,7 @@ if [ -n "$DEFAULT_GATEWAY" ] ; then
flush set inet fw4 tp_spec_def_gw
add element inet fw4 tp_spec_def_gw { $DEFAULT_GATEWAY }
EOF
service dnsmasq restart
else
logger -st transparent-proxy-ipset[$$] -p6 "default gateway not available, please wait for interface ready"
fi

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.0-20221212
PKG_VERSION:=1.0.0-20221213
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Xteve

View File

@ -31,12 +31,9 @@ o:depends("hostnet", 0)
o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
o.rmempty = false
o.datatype = "string"
if "x86_64" == docker_info.Architecture then
o:value("alturismo/xteve_guide2go", "alturismo/xteve_guide2go")
o.default = "alturismo/xteve_guide2go"
elseif "aarch64" == docker_info.Architecture then
o:value("coolyzp/xteve_guide2go:linux-arm64", "coolyzp/xteve_guide2go:linux-arm64")
o.default = "coolyzp/xteve_guide2go:linux-arm64"
if "x86_64" == docker_info.Architecture or "aarch64" == docker_info.Architecture then
o:value("jjm2473/xteve_guide2go", "jjm2473/xteve_guide2go")
o.default = "jjm2473/xteve_guide2go"
else
o:value("", translate("Unsupported Architecture"))
o.default = ""

View File

@ -16,8 +16,7 @@ do_install() {
fi
if [ -z "$image_name" ]; then
local arch=`uname -m`
[ "$arch" = "x86_64" ] && image_name="alturismo/xteve_guide2go"
[ "$arch" = "aarch64" ] && image_name="coolyzp/xteve_guide2go:linux-arm64"
[ "$arch" = "x86_64" -o "$arch" = "aarch64" ] && image_name="jjm2473/xteve_guide2go"
if [ -z "$image_name" ]; then
echo "$arch is unsupported!" >&2
exit 1

View File

@ -21,14 +21,6 @@ do_install() {
exit 1
fi
local unameinfo=`uname -m`
if echo "$unameinfo" | grep -Eqi 'x86_64'; then
echo "x86_64 supported"
else
echo "$unameinfo not supported, only x86_64 supported"
exit 1
fi
[ -z "$port" ] && port=2345
local cmd="docker run --restart=unless-stopped -d -h $hostname \

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=Xray-core
PKG_VERSION:=1.6.6
PKG_RELEASE:=$(AUTORELEASE)
PKG_VERSION:=1.6.6-2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=b92053f2bde18fb83efeb938b1d5fa7a9d62e8fe8c795e747b8c521e1cbd002a
PKG_HASH:=228fedbf5b624883ed2b0d1e3acf66842df483aa5a113995a4434314b3e755eb
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MPL-2.0