Update v2ray and add kernel 6.1 MPTCP aggregation support

golang-protobuf/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
+# Copyright (C) 2019-2023 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,8 +12,8 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/golang/protobuf.git
-PKG_SOURCE_VERSION:=347cf4a86c1cb8d262994d8ef5924d4576c5b331
-PKG_SOURCE_DATE:=20190109
+PKG_SOURCE_VERSION:=5d5e8c018a13017f9d5b8bf4fad64aaa42a87308
+PKG_SOURCE_DATE:=20210916
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

protobuf/Makefile

@@ -1,21 +1,23 @@
 #
 # Copyright (C) 2007-2015 OpenWrt.org
+# Copyright (C) 2017-2023 Yannick Chabanois <ycarus@zugaina.org> for OpenMPTCProuter
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
+# Original ebuild from Ken Keys <kkeys@caida.org>
+# Updated by Yannick Chabanois <ycarus@zugaina.org> for OpenMPTCProuter
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=protobuf
-PKG_VERSION:=3.14.0
+PKG_VERSION:=3.17.3
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
-PKG_HASH:=50ec5a07c0c55d4ec536dd49021f2e194a26bfdbc531d03d1e9d4d3e27175659
+PKG_HASH:=51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb
 
-PKG_MAINTAINER:=Ken Keys <kkeys@caida.org>
+PKG_MAINTAINER:=Yannick Chabanois <ycarus@zugaina.org>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:google:protobuf

v2ray-core/Makefile

@@ -8,9 +8,12 @@ PKG_NAME:=v2ray-core
 PKG_VERSION:=5.7.0
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=599fcd264537e39178b6008a11af68816dfd1609e19a9cf8adc8b2a4240ee370
+#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+#PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
+#PKG_HASH:=599fcd264537e39178b6008a11af68816dfd1609e19a9cf8adc8b2a4240ee370
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/v2fly/v2ray-core.git
+PKG_SOURCE_VERSION:=d58649764e3afa52234ada9a28b7ae79577a23a9
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

v2ray-core/files/etc/init.d/v2ray

@@ -51,6 +51,17 @@ _err() {
 	_log "err" $@
 }
 
+version_over_5_4() {
+	MAJOR_VERSION=$(uname -r | awk -F '.' '{print $1}')
+	MINOR_VERSION=$(uname -r | awk -F '.' '{print $2}')
+	if [ $MAJOR_VERSION -ge 5 ] && [ $MINOR_VERSION -gt 13 ] || [ $MAJOR_VERSION -gt 5 ] ; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+
 get_value_from_json() {
 	local json="$1"
 	local key="$2"
@@ -1295,6 +1306,9 @@ add_inbound_setting() {
 		test -n "$ss_sockopt_tproxy" && \
 			json_add_string "tproxy" "$ss_sockopt_tproxy"
 #	fi
+	if version_over_5_4; then
+		json_add_boolean "mptcp" "1"
+	fi
 
 	json_close_object # sockopt
 
@@ -1944,16 +1958,6 @@ clear_transparent_proxy() {
 	fi
 }
 
-version_over_5_4() {
-	MAJOR_VERSION=$(uname -r | awk -F '.' '{print $1}')
-	MINOR_VERSION=$(uname -r | awk -F '.' '{print $2}')
-	if [ $MAJOR_VERSION -ge 5 ] && [ $MINOR_VERSION -gt 13 ] || [ $MAJOR_VERSION -gt 5 ] ; then
-		return 0
-	else
-		return 1
-	fi
-}
-
 start_instance() {
 	local section="$1"
 
@@ -2068,9 +2072,6 @@ start_instance() {
 	PROG="$NAME.$section"
 
 	TRANSPARENT_PROXY_EXPECTED=1
-	if version_over_5_4; then
-		PROG="mptcpize run ${PROG}"
-	fi
 	procd_open_instance "$PROG"
 	procd_set_param command "$v2ray_file"
 	procd_append_param command run