diff --git a/gn/gn/Makefile b/gn/gn/Makefile deleted file mode 100644 index fccd226fd..000000000 --- a/gn/gn/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-only -# -# Copyright (C) 2022 ImmortalWrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gn -PKG_RELEASE:=4 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git -PKG_SOURCE_DATE:=2023-04-05 -PKG_SOURCE_VERSION:=28b7b6c507eb808567e3aea446cd259f7691fddc -PKG_MIRROR_HASH:=skip - -PKG_LICENSE:=BSD 3-Clause -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Tianling Shen - -ifneq ($(wildcard $(TOPDIR)/feeds/packages/devel/ninja/ninja.mk),) -PKG_BUILD_DEPENDS+= ninja/host -endif -PKG_HOST_ONLY:=1 -HOST_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/package.mk - -define Package/gn - SECTION:=devel - CATEGORY:=Development - TITLE:=A meta-build system that generates build files for Ninja - URL:=https://gn.googlesource.com/gn/ - BUILDONLY:=1 -endef - -define Package/gn/description - GN can generate Ninja build files for C, C++, Rust, Objective C, - and Swift source on most popular platforms. -endef - -define Host/Configure - $(PYTHON) $(HOST_BUILD_DIR)/build/gen.py \ - --no-last-commit-position -endef - -define Host/Compile - ninja -C $(HOST_BUILD_DIR)/out -endef - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/ - $(INSTALL_BIN) $(HOST_BUILD_DIR)/out/gn $(STAGING_DIR_HOSTPKG)/bin/ -endef - -define Host/Clean - $(RM) $(STAGING_DIR_HOSTPKG)/bin/gn -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,gn)) diff --git a/gn/gn/src/out/last_commit_position.h b/gn/gn/src/out/last_commit_position.h deleted file mode 100644 index 28b7516ee..000000000 --- a/gn/gn/src/out/last_commit_position.h +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by build/gen.py. - -#ifndef OUT_LAST_COMMIT_POSITION_H_ -#define OUT_LAST_COMMIT_POSITION_H_ - -#define LAST_COMMIT_POSITION_NUM 2085 -#define LAST_COMMIT_POSITION "2085 (28b7b6c507eb)" - -#endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/gn/gn/patches/010-gcc.patch b/gn/patches/010-gcc.patch similarity index 100% rename from gn/gn/patches/010-gcc.patch rename to gn/patches/010-gcc.patch diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 9ca14868c..a6be5c975 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=4.70-1 +PKG_VERSION:=4.70-2 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/passwall/util_sing-box.lua b/luci-app-passwall/luasrc/passwall/util_sing-box.lua index eb57ba838..e34855517 100644 --- a/luci-app-passwall/luasrc/passwall/util_sing-box.lua +++ b/luci-app-passwall/luasrc/passwall/util_sing-box.lua @@ -302,7 +302,11 @@ function gen_outbound(flag, node, tag, proxy_table) udp_over_stream = false, zero_rtt_handshake = (node.tuic_zero_rtt_handshake == "1") and true or false, heartbeat = tonumber(node.tuic_heartbeat), - tls = tls, + tls = { + enabled = true, + server_name = node.tls_serverName, + insecure = (node.tls_allowInsecure == "1") and true or false, + }, } end @@ -315,7 +319,11 @@ function gen_outbound(flag, node, tag, proxy_table) password = node.hysteria2_obfs_password }, password = node.hysteria2_auth_password or nil, - tls = tls, + tls = { + enabled = true, + server_name = node.tls_serverName, + insecure = (node.tls_allowInsecure == "1") and true or false, + }, } end @@ -536,7 +544,11 @@ function gen_config_server(node) congestion_control = node.tuic_congestion_control or "cubic", zero_rtt_handshake = (node.tuic_zero_rtt_handshake == "1") and true or false, heartbeat = node.tuic_heartbeat .. "s", - tls = tls, + tls = { + enabled = true, + certificate_path = node.tls_certificateFile, + key_path = node.tls_keyFile, + }, } end @@ -555,7 +567,11 @@ function gen_config_server(node) } }, ignore_client_bandwidth = (node.hysteria2_ignore_client_bandwidth == "1") and true or false, - tls = tls, + tls = { + enabled = true, + certificate_path = node.tls_certificateFile, + key_path = node.tls_keyFile, + }, } end diff --git a/natflow/Makefile b/natflow/Makefile index a57ff4b5d..ba1dd9794 100644 --- a/natflow/Makefile +++ b/natflow/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=natflow -PKG_VERSION:=20230907 +PKG_VERSION:=20230909 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)? -PKG_HASH:=0ee5394f2d1fc3aab1f2b52c19e43424244e4a9e5d18081082ec0699a7f45931 +PKG_HASH:=c91380fbcfdb72d101d9ca34e126a6852d2db478522b90ed668f164870a4cc98 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MAINTAINER:=Chen Minqiang diff --git a/natflow/files/natflow-qos.init b/natflow/files/natflow-qos.init index 5ec1beef0..c3b619e7c 100644 --- a/natflow/files/natflow-qos.init +++ b/natflow/files/natflow-qos.init @@ -140,7 +140,6 @@ natflow_qos_zone_setup_tc() ifconfig -a | grep "^$IFN " | awk '{print $1}' | while read lan; do if [ "${lan}" = "${lan//:}" ]; then qos_id=0 - tc qdisc add dev $lan root handle 1: htb cat /dev/qos_ctl | grep "^add user=" | while read line; do line="${line/*rxbytes=}" rxbytes="${line/,*}" @@ -149,10 +148,16 @@ natflow_qos_zone_setup_tc() quantum=256 fi qos_id=$((qos_id+1)) - echo setup tc for $lan @lan rxbytes=$rxbytes quantum=$quantum qos_id=$qos_id - tc class add dev $lan parent 1: classid 1:${qos_id} htb rate ${rxbytes}Bps quantum $quantum - tc filter add dev $lan parent 1: protocol ip prio 1 handle ${qos_id} fw classid 1:${qos_id} - tc filter add dev $lan parent 1: protocol 0x8864 prio 2 handle ${qos_id} fw classid 1:${qos_id} + QOSID=$((qos_id*2-1)) + lower1=$(for vif in /sys/class/net/$lan/lower_*; do test -e $vif && echo ${vif##/sys/class/net/*/lower_}; done) + lower2=$(for dev in $lower1; do for vif in /sys/class/net/$dev/lower_*; do test -e $vif && echo ${vif##/sys/class/net/*/lower_}; done; done) + devs=$(for dev in $lan $lower1 $lower2; do echo $dev; done | sort | uniq); + echo setup tc for @lan=[`echo $devs`] rxbytes=$rxbytes quantum=$quantum rule_id=${qos_id} QOSID=${QOSID} + for DEVICE in $devs; do + tc qdisc add dev $DEVICE root handle 1: htb &>/dev/null + tc class add dev $DEVICE parent 1: classid 1:${QOSID} htb rate ${rxbytes}Bps quantum $quantum &>/dev/null + tc filter add dev $DEVICE parent 1: protocol all prio 1 handle ${QOSID} fw classid 1:${QOSID} &>/dev/null + done done fi done @@ -161,7 +166,6 @@ natflow_qos_zone_setup_tc() ifconfig -a | grep "^$IFN " | awk '{print $1}' | while read wan; do if [ "${wan}" = "${wan//:}" ]; then qos_id=0 - tc qdisc add dev $wan root handle 1: htb cat /dev/qos_ctl | grep "^add user=" | while read line; do txbytes="${line/*,txbytes=}" quantum=$(($txbytes/1000)) @@ -169,10 +173,16 @@ natflow_qos_zone_setup_tc() quantum=256 fi qos_id=$((qos_id+1)) - echo setup tc for $wan @wan txbytes=$txbytes quantum=$quantum qos_id=$qos_id - tc class add dev $wan parent 1: classid 1:${qos_id} htb rate ${txbytes}Bps quantum $quantum - tc filter add dev $wan parent 1: protocol ip prio 1 handle ${qos_id} fw classid 1:${qos_id} - tc filter add dev $wan parent 1: protocol 0x8864 prio 2 handle ${qos_id} fw classid 1:${qos_id} + QOSID=$((qos_id*2)) + lower1=$(for vif in /sys/class/net/$wan/lower_*; do test -e $vif && echo ${vif##/sys/class/net/*/lower_}; done) + lower2=$(for dev in $lower1; do for vif in /sys/class/net/$dev/lower_*; do test -e $vif && echo ${vif##/sys/class/net/*/lower_}; done; done) + devs=$(for dev in $wan $lower1 $lower2; do echo $dev; done | sort | uniq); + echo setup tc for @wan=[`echo $devs`] txbytes=$txbytes quantum=$quantum rule_id=${qos_id} QOSID=${QOSID} + for DEVICE in $devs; do + tc qdisc add dev $DEVICE root handle 1: htb &>/dev/null + tc class add dev $DEVICE parent 1: classid 1:${QOSID} htb rate ${txbytes}Bps quantum $quantum &>/dev/null + tc filter add dev $DEVICE parent 1: protocol all prio 1 handle ${QOSID} fw classid 1:${QOSID} &>/dev/null + done done fi done