diff --git a/net/clash/Makefile b/net/clash/Makefile index d6b52f6cee51..4e26125f07e0 100644 --- a/net/clash/Makefile +++ b/net/clash/Makefile @@ -1,25 +1,25 @@ PORTNAME= clash DISTVERSIONPREFIX= v -DISTVERSION= 1.10.0 +DISTVERSION= 1.10.6 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org COMMENT= Rule-based tunnel in Go LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules cpe CPE_VENDOR= clash_project GO_MODULE= github.com/Dreamacro/clash PLIST_FILES= bin/${PORTNAME} PORTSCOUT= limit:^[0-9\.]*$$ pre-patch: @cd ${WRKSRC} && ${CP} listener/redir/tcp_linux.go listener/redir/tcp_freebsd.go .include diff --git a/net/clash/distinfo b/net/clash/distinfo index 000083afed2d..1a6acb520b13 100644 --- a/net/clash/distinfo +++ b/net/clash/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1651866719 -SHA256 (go/net_clash/clash-v1.10.0/v1.10.0.mod) = df7e134a20446897a61ab9c6ed8e2e50e901148de69744dbce391a82c0c0fa7b -SIZE (go/net_clash/clash-v1.10.0/v1.10.0.mod) = 1327 -SHA256 (go/net_clash/clash-v1.10.0/v1.10.0.zip) = 6841d86bb9ac4f6bc197b7d994a9ba1d2de5283c36e1ec8137ac38f52b25de9a -SIZE (go/net_clash/clash-v1.10.0/v1.10.0.zip) = 257295 +TIMESTAMP = 1653189925 +SHA256 (go/net_clash/clash-v1.10.6/v1.10.6.mod) = 930ba4400186209c8b8a4edc475577bf76ca81b5acce11c01a05d3c7d95a7d81 +SIZE (go/net_clash/clash-v1.10.6/v1.10.6.mod) = 1366 +SHA256 (go/net_clash/clash-v1.10.6/v1.10.6.zip) = cd7d2dcd94f804119e10917faebae85d4b866eccee3e598567d44805b188740a +SIZE (go/net_clash/clash-v1.10.6/v1.10.6.zip) = 259115 diff --git a/net/clash/files/patch-listener_redir_tcp__freebsd.go b/net/clash/files/patch-listener_redir_tcp__freebsd.go index a4b1df21095b..b1a770082637 100644 --- a/net/clash/files/patch-listener_redir_tcp__freebsd.go +++ b/net/clash/files/patch-listener_redir_tcp__freebsd.go @@ -1,12 +1,12 @@ ---- listener/redir/tcp_freebsd.go.orig 2021-07-04 17:12:45 UTC +--- listener/redir/tcp_freebsd.go.orig 2022-05-22 03:30:14 UTC +++ listener/redir/tcp_freebsd.go @@ -38,7 +38,8 @@ func parserPacket(conn net.Conn) (socks5.Addr, error) func getorigdst(fd uintptr) (socks5.Addr, error) { raw := syscall.RawSockaddrInet4{} - siz := unsafe.Sizeof(raw) + siz := uint32(unsafe.Sizeof(raw)) - if err := socketcall(GETSOCKOPT, fd, syscall.IPPROTO_IP, SO_ORIGINAL_DST, uintptr(unsafe.Pointer(&raw)), uintptr(unsafe.Pointer(&siz)), 0); err != nil { + _, _, err := syscall.Syscall6(syscall.SYS_GETSOCKOPT, fd, syscall.IPPROTO_IP, SO_ORIGINAL_DST, uintptr(unsafe.Pointer(&raw)), uintptr(unsafe.Pointer(&siz)), 0); + if err != 0 { return nil, err }