v3.5.1 release

1. Fix an issue that project libraries can't be imported by third party projects (issue #161).
enfein · Oct 1, 2024 · b0d63ac · b0d63ac
1 parent 77124d6
commit b0d63ac
Show file tree

Hide file tree

Showing 80 changed files with 203 additions and 200 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,6 +15,8 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
+      - name: Create vendor directory
+        run: make vendor
       - name: Build binaries
         run: make build
       - name: Upload artifacts

diff --git 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.5.0"
+VERSION="3.5.1"
 
 # Build binaries and installation packages.
 .PHONY: build
@@ -51,6 +51,7 @@ lib: fmt vet
 
 # Run benchmark.
 .PHONY: bench
+bench:
 	CGO_ENABLED=0 go test -bench=. -benchtime=5s ./pkg/cipher
 
 # Generate vendor directory.

diff --git a/build/package/mieru/amd64/debian/DEBIAN/control b/build/package/mieru/amd64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mieru
-Version: 3.5.0
+Version: 3.5.1
 Section: net
 Priority: optional
 Architecture: amd64

diff --git a/build/package/mieru/amd64/rpm/mieru.spec b/build/package/mieru/amd64/rpm/mieru.spec
@@ -1,5 +1,5 @@
 Name: mieru
-Version: 3.5.0
+Version: 3.5.1
 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
@@ -1,5 +1,5 @@
 Package: mieru
-Version: 3.5.0
+Version: 3.5.1
 Section: net
 Priority: optional
 Architecture: arm64

diff --git a/build/package/mieru/arm64/rpm/mieru.spec b/build/package/mieru/arm64/rpm/mieru.spec
@@ -1,5 +1,5 @@
 Name: mieru
-Version: 3.5.0
+Version: 3.5.1
 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
@@ -1,5 +1,5 @@
 Package: mita
-Version: 3.5.0
+Version: 3.5.1
 Section: net
 Priority: optional
 Architecture: amd64

diff --git a/build/package/mita/amd64/rpm/mita.spec b/build/package/mita/amd64/rpm/mita.spec
@@ -1,5 +1,5 @@
 Name: mita
-Version: 3.5.0
+Version: 3.5.1
 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
@@ -1,5 +1,5 @@
 Package: mita
-Version: 3.5.0
+Version: 3.5.1
 Section: net
 Priority: optional
 Architecture: arm64

diff --git a/build/package/mita/arm64/rpm/mita.spec b/build/package/mita/arm64/rpm/mita.spec
@@ -1,5 +1,5 @@
 Name: mita
-Version: 3.5.0
+Version: 3.5.1
 Release: 1%{?dist}
 Summary: Mieru proxy server
 License: GPLv3+

diff --git a/cmd/mieru/mieru.go b/cmd/mieru/mieru.go
@@ -19,9 +19,9 @@ package main
 import (
 	"runtime/debug"
 
-	"github.com/enfein/mieru/pkg/appctl"
-	"github.com/enfein/mieru/pkg/cli"
-	"github.com/enfein/mieru/pkg/log"
+	"github.com/enfein/mieru/v3/pkg/appctl"
+	"github.com/enfein/mieru/v3/pkg/cli"
+	"github.com/enfein/mieru/v3/pkg/log"
 )
 
 func main() {

diff --git a/cmd/mita/mita.go b/cmd/mita/mita.go
@@ -19,9 +19,9 @@ package main
 import (
 	"runtime/debug"
 
-	"github.com/enfein/mieru/pkg/appctl"
-	"github.com/enfein/mieru/pkg/cli"
-	"github.com/enfein/mieru/pkg/log"
+	"github.com/enfein/mieru/v3/pkg/appctl"
+	"github.com/enfein/mieru/v3/pkg/cli"
+	"github.com/enfein/mieru/v3/pkg/log"
 )
 
 func main() {

diff --git 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.5.0/mita_3.5.0_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.1/mita_3.5.1_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.0/mita_3.5.0_arm64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.1/mita_3.5.1_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.0/mita-3.5.0-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.1/mita-3.5.1-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.0/mita-3.5.0-1.aarch64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.1/mita-3.5.1-1.aarch64.rpm
 ```
 
 ## Install mita package
 
 ```sh
 # Debian / Ubuntu - X86_64
-sudo dpkg -i mita_3.5.0_amd64.deb
+sudo dpkg -i mita_3.5.1_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-sudo dpkg -i mita_3.5.0_arm64.deb
+sudo dpkg -i mita_3.5.1_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-sudo rpm -Uvh --force mita-3.5.0-1.x86_64.rpm
+sudo rpm -Uvh --force mita-3.5.1-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-sudo rpm -Uvh --force mita-3.5.0-1.aarch64.rpm
+sudo rpm -Uvh --force mita-3.5.1-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
@@ -8,32 +8,32 @@
 
 ```sh
 # Debian / Ubuntu - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.0/mita_3.5.0_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.1/mita_3.5.1_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.0/mita_3.5.0_arm64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.1/mita_3.5.1_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.0/mita-3.5.0-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.1/mita-3.5.1-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.0/mita-3.5.0-1.aarch64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.5.1/mita-3.5.1-1.aarch64.rpm
 ```
 
 ## 安装 mita 软件包
 
 ```sh
 # Debian / Ubuntu - X86_64
-sudo dpkg -i mita_3.5.0_amd64.deb
+sudo dpkg -i mita_3.5.1_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-sudo dpkg -i mita_3.5.0_arm64.deb
+sudo dpkg -i mita_3.5.1_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-sudo rpm -Uvh --force mita-3.5.0-1.x86_64.rpm
+sudo rpm -Uvh --force mita-3.5.1-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-sudo rpm -Uvh --force mita-3.5.0-1.aarch64.rpm
+sudo rpm -Uvh --force mita-3.5.1-1.aarch64.rpm
 ```
 
 上述指令也可以用来升级 mita 软件包的版本。

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/enfein/mieru
+module github.com/enfein/mieru/v3
 
 go 1.20
 

diff --git a/pkg/appctl/appstatus.go b/pkg/appctl/appstatus.go
@@ -18,7 +18,7 @@ package appctl
 import (
 	"sync/atomic"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
 )
 
 // currentAppStatus stores the current application running status.

diff --git a/pkg/appctl/client.go b/pkg/appctl/client.go
@@ -27,13 +27,13 @@ import (
 	"sync"
 	"sync/atomic"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
-	"github.com/enfein/mieru/pkg/log"
-	"github.com/enfein/mieru/pkg/metrics"
-	"github.com/enfein/mieru/pkg/protocol"
-	"github.com/enfein/mieru/pkg/socks5"
-	"github.com/enfein/mieru/pkg/stderror"
-	"github.com/enfein/mieru/pkg/util"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
+	"github.com/enfein/mieru/v3/pkg/log"
+	"github.com/enfein/mieru/v3/pkg/metrics"
+	"github.com/enfein/mieru/v3/pkg/protocol"
+	"github.com/enfein/mieru/v3/pkg/socks5"
+	"github.com/enfein/mieru/v3/pkg/stderror"
+	"github.com/enfein/mieru/v3/pkg/util"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 )

diff --git a/pkg/appctl/client_test.go b/pkg/appctl/client_test.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"testing"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
-	"github.com/enfein/mieru/pkg/util"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
+	"github.com/enfein/mieru/v3/pkg/util"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/pkg/appctl/debug_support.go b/pkg/appctl/debug_support.go
@@ -8,7 +8,7 @@ import (
 	"runtime/pprof"
 	"sync"
 
-	"github.com/enfein/mieru/pkg/stderror"
+	"github.com/enfein/mieru/v3/pkg/stderror"
 )
 
 var (

diff --git a/pkg/appctl/port_binding.go b/pkg/appctl/port_binding.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strconv"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/pkg/appctl/server.go b/pkg/appctl/server.go
@@ -27,14 +27,14 @@ import (
 	"sync/atomic"
 	"time"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
-	"github.com/enfein/mieru/pkg/egress"
-	"github.com/enfein/mieru/pkg/log"
-	"github.com/enfein/mieru/pkg/metrics"
-	"github.com/enfein/mieru/pkg/protocol"
-	"github.com/enfein/mieru/pkg/socks5"
-	"github.com/enfein/mieru/pkg/stderror"
-	"github.com/enfein/mieru/pkg/util"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
+	"github.com/enfein/mieru/v3/pkg/egress"
+	"github.com/enfein/mieru/v3/pkg/log"
+	"github.com/enfein/mieru/v3/pkg/metrics"
+	"github.com/enfein/mieru/v3/pkg/protocol"
+	"github.com/enfein/mieru/v3/pkg/socks5"
+	"github.com/enfein/mieru/v3/pkg/stderror"
+	"github.com/enfein/mieru/v3/pkg/util"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 )

diff --git a/pkg/appctl/server_test.go b/pkg/appctl/server_test.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"testing"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
-	"github.com/enfein/mieru/pkg/util"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
+	"github.com/enfein/mieru/v3/pkg/util"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/pkg/appctl/url.go b/pkg/appctl/url.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"net/url"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
-	"github.com/enfein/mieru/pkg/stderror"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
+	"github.com/enfein/mieru/v3/pkg/stderror"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/pkg/appctl/url_test.go b/pkg/appctl/url_test.go
@@ -18,7 +18,7 @@ package appctl
 import (
 	"testing"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/pkg/appctl/user.go b/pkg/appctl/user.go
@@ -18,8 +18,8 @@ package appctl
 import (
 	"encoding/hex"
 
-	pb "github.com/enfein/mieru/pkg/appctl/appctlpb"
-	"github.com/enfein/mieru/pkg/cipher"
+	pb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
+	"github.com/enfein/mieru/v3/pkg/cipher"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/pkg/cipher/api.go b/pkg/cipher/api.go
@@ -19,7 +19,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 
-	"github.com/enfein/mieru/pkg/metrics"
+	"github.com/enfein/mieru/v3/pkg/metrics"
 )
 
 const (

diff --git a/pkg/cipher/cipher.go b/pkg/cipher/cipher.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/enfein/mieru/pkg/util"
+	"github.com/enfein/mieru/v3/pkg/util"
 
 	"golang.org/x/crypto/chacha20poly1305"
 )

diff --git a/pkg/cipher/cipher_test.go b/pkg/cipher/cipher_test.go
@@ -21,7 +21,7 @@ import (
 	mrand "math/rand"
 	"testing"
 
-	"github.com/enfein/mieru/pkg/util"
+	"github.com/enfein/mieru/v3/pkg/util"
 )
 
 func TestDefaultNonceSize(t *testing.T) {

diff --git a/pkg/cli/client.go b/pkg/cli/client.go
@@ -31,16 +31,16 @@ import (
 	"sync"
 	"time"
 
-	"github.com/enfein/mieru/pkg/appctl"
-	"github.com/enfein/mieru/pkg/appctl/appctlpb"
-	"github.com/enfein/mieru/pkg/cipher"
-	"github.com/enfein/mieru/pkg/log"
-	"github.com/enfein/mieru/pkg/metrics"
-	"github.com/enfein/mieru/pkg/protocol"
-	"github.com/enfein/mieru/pkg/socks5"
-	"github.com/enfein/mieru/pkg/stderror"
-	"github.com/enfein/mieru/pkg/util"
-	"github.com/enfein/mieru/pkg/util/sockopts"
+	"github.com/enfein/mieru/v3/pkg/appctl"
+	"github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
+	"github.com/enfein/mieru/v3/pkg/cipher"
+	"github.com/enfein/mieru/v3/pkg/log"
+	"github.com/enfein/mieru/v3/pkg/metrics"
+	"github.com/enfein/mieru/v3/pkg/protocol"
+	"github.com/enfein/mieru/v3/pkg/socks5"
+	"github.com/enfein/mieru/v3/pkg/stderror"
+	"github.com/enfein/mieru/v3/pkg/util"
+	"github.com/enfein/mieru/v3/pkg/util/sockopts"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 )

diff --git a/pkg/cli/helpfmt.go b/pkg/cli/helpfmt.go
@@ -15,7 +15,7 @@
 
 package cli
 
-import "github.com/enfein/mieru/pkg/log"
+import "github.com/enfein/mieru/v3/pkg/log"
 
 type helpFormatter struct {
 	appName  string
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ import ( @@
     	"runtime/pprof"
     	"sync"
-    	"github.com/enfein/mieru/pkg/stderror"
+    	"github.com/enfein/mieru/v3/pkg/stderror"
     )
     var (
@@ Expand Down @@