From nobody Sun May 22 03:48:56 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F18431B475B4; Sun, 22 May 2022 03:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L5RK442n6z3C97; Sun, 22 May 2022 03:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653191336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZNBPL2sqpdSw3xKBP5O1aRE582lMb539SbHANcb0Av8=; b=hfsULmnsNFTHab0yuvx0YA7PBaGCxMbMawAM4B0R+1dv9qVrkejT/puus5H84Tv4OArwt7 8RiOTaxKwhvf4BF5kdtk2QW13F409NU/Nn0NZNlV4yL1I/0ER5Z2euCoctxj3zZh84aPYl 4pKAUtwdg7/b7Q7+ixoF+UcPQQbJh6s61sKGwaiV2ekP7Y9+8tw0EMaH0PfwpL2qUeJpcO ZmhsphQcCtHf0voV8OOVTD7m5rSisnrYOt8SvK50FdUMD/U2p9ACZ7KO9OxRKkyUREnT6z OjPzmKH6sOx/+g7Q3a8E/7ZdQQjA4o8K4P6r77tiVUumcfEeYod96aUX16WxMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C5771403C; Sun, 22 May 2022 03:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24M3muiM037885; Sun, 22 May 2022 03:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24M3mu5U037884; Sun, 22 May 2022 03:48:56 GMT (envelope-from git) Date: Sun, 22 May 2022 03:48:56 GMT Message-Id: <202205220348.24M3mu5U037884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 9f12cfd031bf - main - net/clash: Update 1.10.0 -> 1.10.6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f12cfd031bfad5f96f69668d3ceefd6c9c39837 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653191336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZNBPL2sqpdSw3xKBP5O1aRE582lMb539SbHANcb0Av8=; b=aHglu7UdPjVvVBWg7Y7yDkluKigdnIcedgkXlkbUsjLlow6BmtaEG0aRSrEG5Plo/mXTEe mPW2C9XrTQwV3froWzp/NduSoHUkr4p3nHKAaaa9t5wTRGOg+t9I9lhHlo9b3zOfS49M41 G39Q+c0LRMzaZKrsBwhc7DcWtcmmKkQDh0pS2c0EbpZBzJl8YAZM4PDA4EX+SbdVLlJuwg biB9nz1i8oLgc7PKzjtYT2XcYiDx9XVxCnnbM+MPh7WaYNO4JjnYxoumpP8UQlXYI41ngg eL2HaHpiO0YrEM76UNHkC2DUhkP4oHKkegf3yMnd0FXxSSksldIJFYN4p9TMRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653191336; a=rsa-sha256; cv=none; b=cG1oWvqVE29CCnaP7GqcbchJBqXfk3qxajXL5UofjoFLXDotylfiqJQBjrvswm3dUhMKxF AKd0/ONA/Hv1kXqbcfJMLZHu8e6wl1dB0rP3a/dXoFvLWhwk/3m4EtBYQStJK4Y2bvVsOl tV8IvRgvkY4UXr+A8tSEWRfD4WWcI1gqO9ArwerRfgzHTOm11TzHhRQHQyKiaX20Uoz1+x l1HJJd/izE/AJhrR6qQuJzS9UnQTofCD8/z78eWI5QmrCoVZQtkBvaKX3N4MfC/DcILuvF Tq/b3bzlV+E7Kdbbj2iKgyDvGI+xFBP0rJlkMIL5uXaHC0dlLf4hXc5sOq8/Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f12cfd031bfad5f96f69668d3ceefd6c9c39837 commit 9f12cfd031bfad5f96f69668d3ceefd6c9c39837 Author: Yuri Victorovich AuthorDate: 2022-05-22 03:39:22 +0000 Commit: Yuri Victorovich CommitDate: 2022-05-22 03:48:49 +0000 net/clash: Update 1.10.0 -> 1.10.6 --- net/clash/Makefile | 2 +- net/clash/distinfo | 10 +++++----- net/clash/files/patch-listener_redir_tcp__freebsd.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/clash/Makefile b/net/clash/Makefile index d6b52f6cee51..4e26125f07e0 100644 --- a/net/clash/Makefile +++ b/net/clash/Makefile @@ -1,6 +1,6 @@ PORTNAME= clash DISTVERSIONPREFIX= v -DISTVERSION= 1.10.0 +DISTVERSION= 1.10.6 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org 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,9 +1,9 @@ ---- 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 {