diff --git a/Makefile b/Makefile index 2d9662111..c8e6076f9 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ PROJECT_NAME=$(shell basename "${ROOT}") # - pkg/version/current.go # # Use `tools/bump_version.sh` script to change all those files at one shot. -VERSION="3.11.2" +VERSION="3.12.0" # Build binaries and installation packages. .PHONY: build diff --git a/build/package/mieru/amd64/debian/DEBIAN/control b/build/package/mieru/amd64/debian/DEBIAN/control index 57e12850a..7ae164649 100755 --- a/build/package/mieru/amd64/debian/DEBIAN/control +++ b/build/package/mieru/amd64/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: mieru -Version: 3.11.2 +Version: 3.12.0 Section: net Priority: optional Architecture: amd64 diff --git a/build/package/mieru/amd64/rpm/mieru.spec b/build/package/mieru/amd64/rpm/mieru.spec index 01a076bff..b777c060c 100644 --- a/build/package/mieru/amd64/rpm/mieru.spec +++ b/build/package/mieru/amd64/rpm/mieru.spec @@ -1,5 +1,5 @@ Name: mieru -Version: 3.11.2 +Version: 3.12.0 Release: 1%{?dist} Summary: Mieru proxy client License: GPLv3+ diff --git a/build/package/mieru/arm64/debian/DEBIAN/control b/build/package/mieru/arm64/debian/DEBIAN/control index 310857ff9..8216eb4bb 100755 --- a/build/package/mieru/arm64/debian/DEBIAN/control +++ b/build/package/mieru/arm64/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: mieru -Version: 3.11.2 +Version: 3.12.0 Section: net Priority: optional Architecture: arm64 diff --git a/build/package/mieru/arm64/rpm/mieru.spec b/build/package/mieru/arm64/rpm/mieru.spec index 01a076bff..b777c060c 100644 --- a/build/package/mieru/arm64/rpm/mieru.spec +++ b/build/package/mieru/arm64/rpm/mieru.spec @@ -1,5 +1,5 @@ Name: mieru -Version: 3.11.2 +Version: 3.12.0 Release: 1%{?dist} Summary: Mieru proxy client License: GPLv3+ diff --git a/build/package/mita/amd64/debian/DEBIAN/control b/build/package/mita/amd64/debian/DEBIAN/control index e3c18bbec..6ccb74205 100755 --- a/build/package/mita/amd64/debian/DEBIAN/control +++ b/build/package/mita/amd64/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: mita -Version: 3.11.2 +Version: 3.12.0 Section: net Priority: optional Architecture: amd64 diff --git a/build/package/mita/amd64/rpm/mita.spec b/build/package/mita/amd64/rpm/mita.spec index cdb4bd248..ac38dddfa 100644 --- a/build/package/mita/amd64/rpm/mita.spec +++ b/build/package/mita/amd64/rpm/mita.spec @@ -1,5 +1,5 @@ Name: mita -Version: 3.11.2 +Version: 3.12.0 Release: 1%{?dist} Summary: Mieru proxy server License: GPLv3+ diff --git a/build/package/mita/arm64/debian/DEBIAN/control b/build/package/mita/arm64/debian/DEBIAN/control index 6e7d8fe3e..cb9550574 100755 --- a/build/package/mita/arm64/debian/DEBIAN/control +++ b/build/package/mita/arm64/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: mita -Version: 3.11.2 +Version: 3.12.0 Section: net Priority: optional Architecture: arm64 diff --git a/build/package/mita/arm64/rpm/mita.spec b/build/package/mita/arm64/rpm/mita.spec index 8746c0c9f..5d264b229 100644 --- a/build/package/mita/arm64/rpm/mita.spec +++ b/build/package/mita/arm64/rpm/mita.spec @@ -1,5 +1,5 @@ Name: mita -Version: 3.11.2 +Version: 3.12.0 Release: 1%{?dist} Summary: Mieru proxy server License: GPLv3+ diff --git a/docs/operation.md b/docs/operation.md index 1f23fbd8b..cd435fcaa 100644 --- a/docs/operation.md +++ b/docs/operation.md @@ -5,9 +5,9 @@ You can run `mieru get connections` command on the client to view the current connections between client and server. An example of the command output is as follows. ``` -Session ID Protocol Local Remote State Recv Q+Buf Send Q+Buf Last Recv Last Send -2187011369 UDP [::]:59998 1.2.3.4:5678 ESTABLISHED 0+0 0+1 1s 1s -1466481848 UDP [::]:59999 1.2.3.4:5678 ESTABLISHED 0+0 0+1 3s 3s +SessionID Protocol Local Remote State RecvQ+Buf SendQ+Buf LastRecv LastSend +3078661580 UDP [::]:34453 12.34.123.45:5852 ESTABLISHED 0+0 0+0 0s (31) 0s (28) +3408448183 UDP [::]:34453 12.34.123.45:5852 ESTABLISHED 0+0 0+0 3s (22) 3s (21) ``` Similarly, you can run `mita get connections` command on the server to view the current connections between the server and all clients. diff --git a/docs/operation.zh_CN.md b/docs/operation.zh_CN.md index 7be5af7cf..e25b45c64 100644 --- a/docs/operation.zh_CN.md +++ b/docs/operation.zh_CN.md @@ -5,9 +5,9 @@ 可以在客户端运行 `mieru get connections` 指令查看当前客户端与服务器之间的连接。该指令输出的一个示例如下。 ``` -Session ID Protocol Local Remote State Recv Q+Buf Send Q+Buf Last Recv Last Send -2187011369 UDP [::]:59998 1.2.3.4:5678 ESTABLISHED 0+0 0+1 1s 1s -1466481848 UDP [::]:59999 1.2.3.4:5678 ESTABLISHED 0+0 0+1 3s 3s +SessionID Protocol Local Remote State RecvQ+Buf SendQ+Buf LastRecv LastSend +3078661580 UDP [::]:34453 12.34.123.45:5852 ESTABLISHED 0+0 0+0 0s (31) 0s (28) +3408448183 UDP [::]:34453 12.34.123.45:5852 ESTABLISHED 0+0 0+0 3s (22) 3s (21) ``` 类似的，可以在服务器运行 `mita get connections` 指令查看当前服务器与所有客户端之间的连接。 diff --git a/docs/server-install.md b/docs/server-install.md index 3eba06930..c7d3ef9bd 100644 --- a/docs/server-install.md +++ b/docs/server-install.md @@ -8,32 +8,32 @@ Before installation and configuration, connect to the server via SSH and then ex ```sh # Debian / Ubuntu - X86_64 -curl -LSO https://github.com/enfein/mieru/releases/download/v3.11.2/mita_3.11.2_amd64.deb +curl -LSO https://github.com/enfein/mieru/releases/download/v3.12.0/mita_3.12.0_amd64.deb # Debian / Ubuntu - ARM 64 -curl -LSO https://github.com/enfein/mieru/releases/download/v3.11.2/mita_3.11.2_arm64.deb +curl -LSO https://github.com/enfein/mieru/releases/download/v3.12.0/mita_3.12.0_arm64.deb # RedHat / CentOS / Rocky Linux - X86_64 -curl -LSO https://github.com/enfein/mieru/releases/download/v3.11.2/mita-3.11.2-1.x86_64.rpm +curl -LSO https://github.com/enfein/mieru/releases/download/v3.12.0/mita-3.12.0-1.x86_64.rpm # RedHat / CentOS / Rocky Linux - ARM 64 -curl -LSO https://github.com/enfein/mieru/releases/download/v3.11.2/mita-3.11.2-1.aarch64.rpm +curl -LSO https://github.com/enfein/mieru/releases/download/v3.12.0/mita-3.12.0-1.aarch64.rpm ``` ## Install mita package ```sh # Debian / Ubuntu - X86_64 -sudo dpkg -i mita_3.11.2_amd64.deb +sudo dpkg -i mita_3.12.0_amd64.deb # Debian / Ubuntu - ARM 64 -sudo dpkg -i mita_3.11.2_arm64.deb +sudo dpkg -i mita_3.12.0_arm64.deb # RedHat / CentOS / Rocky Linux - X86_64 -sudo rpm -Uvh --force mita-3.11.2-1.x86_64.rpm +sudo rpm -Uvh --force mita-3.12.0-1.x86_64.rpm # RedHat / CentOS / Rocky Linux - ARM 64 -sudo rpm -Uvh --force mita-3.11.2-1.aarch64.rpm +sudo rpm -Uvh --force mita-3.12.0-1.aarch64.rpm ``` Those instructions can also be used to upgrade the version of mita software package. diff --git a/docs/server-install.zh_CN.md b/docs/server-install.zh_CN.md index a3a81a949..bfed799d0 100644 --- a/docs/server-install.zh_CN.md +++ b/docs/server-install.zh_CN.md @@ -8,32 +8,32 @@ ```sh # Debian / Ubuntu - X86_64 -curl -LSO https://github.com/enfein/mieru/releases/download/v3.11.2/mita_3.11.2_amd64.deb +curl -LSO https://github.com/enfein/mieru/releases/download/v3.12.0/mita_3.12.0_amd64.deb # Debian / Ubuntu - ARM 64 -curl -LSO https://github.com/enfein/mieru/releases/download/v3.11.2/mita_3.11.2_arm64.deb +curl -LSO https://github.com/enfein/mieru/releases/download/v3.12.0/mita_3.12.0_arm64.deb # RedHat / CentOS / Rocky Linux - X86_64 -curl -LSO https://github.com/enfein/mieru/releases/download/v3.11.2/mita-3.11.2-1.x86_64.rpm +curl -LSO https://github.com/enfein/mieru/releases/download/v3.12.0/mita-3.12.0-1.x86_64.rpm # RedHat / CentOS / Rocky Linux - ARM 64 -curl -LSO https://github.com/enfein/mieru/releases/download/v3.11.2/mita-3.11.2-1.aarch64.rpm +curl -LSO https://github.com/enfein/mieru/releases/download/v3.12.0/mita-3.12.0-1.aarch64.rpm ``` ## 安装 mita 软件包 ```sh # Debian / Ubuntu - X86_64 -sudo dpkg -i mita_3.11.2_amd64.deb +sudo dpkg -i mita_3.12.0_amd64.deb # Debian / Ubuntu - ARM 64 -sudo dpkg -i mita_3.11.2_arm64.deb +sudo dpkg -i mita_3.12.0_arm64.deb # RedHat / CentOS / Rocky Linux - X86_64 -sudo rpm -Uvh --force mita-3.11.2-1.x86_64.rpm +sudo rpm -Uvh --force mita-3.12.0-1.x86_64.rpm # RedHat / CentOS / Rocky Linux - ARM 64 -sudo rpm -Uvh --force mita-3.11.2-1.aarch64.rpm +sudo rpm -Uvh --force mita-3.12.0-1.aarch64.rpm ``` 上述指令也可以用来升级 mita 软件包的版本。 diff --git a/pkg/version/current.go b/pkg/version/current.go index baac92f5d..922992a50 100644 --- a/pkg/version/current.go +++ b/pkg/version/current.go @@ -16,5 +16,5 @@ package version const ( - AppVersion = "3.11.2" + AppVersion = "3.12.0" )