From owner-dev-commits-ports-all@freebsd.org Sun Jul 4 17:37:52 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 21DBB648534; Sun, 4 Jul 2021 17:37:52 +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 4GHwy80JbQz3kPV; Sun, 4 Jul 2021 17:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E829116D12; Sun, 4 Jul 2021 17:37:51 +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 164HbpZo077074; Sun, 4 Jul 2021 17:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 164HbpFF077073; Sun, 4 Jul 2021 17:37:51 GMT (envelope-from git) Date: Sun, 4 Jul 2021 17:37:51 GMT Message-Id: <202107041737.164HbpFF077073@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: 93b1d6256e8a - main - net/clash: Update 1.6.0 -> 1.6.5 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: 93b1d6256e8a7dc49074970f68fb585749848ea1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jul 2021 17:37:52 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=93b1d6256e8a7dc49074970f68fb585749848ea1 commit 93b1d6256e8a7dc49074970f68fb585749848ea1 Author: Yuri Victorovich AuthorDate: 2021-07-04 17:15:51 +0000 Commit: Yuri Victorovich CommitDate: 2021-07-04 17:37:46 +0000 net/clash: Update 1.6.0 -> 1.6.5 Reported by: portscout --- net/clash/Makefile | 30 ++----------- net/clash/distinfo | 50 +++------------------- ...bsd.go => patch-listener_redir_tcp__freebsd.go} | 8 ++-- 3 files changed, 13 insertions(+), 75 deletions(-) diff --git a/net/clash/Makefile b/net/clash/Makefile index 3537ccd98faa..ba547e38a8bc 100644 --- a/net/clash/Makefile +++ b/net/clash/Makefile @@ -1,6 +1,6 @@ PORTNAME= clash DISTVERSIONPREFIX= v -DISTVERSION= 1.6.0 +DISTVERSION= 1.6.5 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -10,36 +10,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules -USE_GITHUB= yes -GH_ACCOUNT= Dreamacro -GH_TUPLE= \ - Dreamacro:go-shadowsocks2:v0.1.7:dreamacro_go_shadowsocks2/vendor/github.com/Dreamacro/go-shadowsocks2 \ - davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ - go-chi:chi:v5.0.3:go_chi_chi_v5/vendor/github.com/go-chi/chi/v5 \ - go-chi:cors:v1.2.0:go_chi_cors/vendor/github.com/go-chi/cors \ - go-chi:render:v1.0.1:go_chi_render/vendor/github.com/go-chi/render \ - go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \ - go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - gofrs:uuid:v4.0.0:gofrs_uuid/vendor/github.com/gofrs/uuid \ - golang:crypto:38f3c27a63bf:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:16afe75a6701:golang_net/vendor/golang.org/x/net \ - golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \ - golang:sys:a76c4d0a0096:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \ - gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \ - miekg:dns:v1.1.42:miekg_dns/vendor/github.com/miekg/dns \ - oschwald:geoip2-golang:v1.5.0:oschwald_geoip2_golang/vendor/github.com/oschwald/geoip2-golang \ - oschwald:maxminddb-golang:v1.8.0:oschwald_maxminddb_golang/vendor/github.com/oschwald/maxminddb-golang \ - pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ - sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ - stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \ - uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic + +GO_MODULE= github.com/Dreamacro/clash PLIST_FILES= bin/${PORTNAME} PORTSCOUT= limit:^[0-9\.]*$$ pre-patch: - @cd ${WRKSRC} && ${CP} proxy/redir/tcp_linux.go proxy/redir/tcp_freebsd.go + @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 20c5f0911913..3b755b8118f0 100644 --- a/net/clash/distinfo +++ b/net/clash/distinfo @@ -1,45 +1,5 @@ -TIMESTAMP = 1620575105 -SHA256 (Dreamacro-clash-v1.6.0_GH0.tar.gz) = 670963bee40fd3edca832a3ead22a92d3fb427ceed05be6c5a111d46a1555330 -SIZE (Dreamacro-clash-v1.6.0_GH0.tar.gz) = 148564 -SHA256 (Dreamacro-go-shadowsocks2-v0.1.7_GH0.tar.gz) = 2e02b470187e0f5464707a56837e4341ac3516f7615454a5df90b306ad385a5b -SIZE (Dreamacro-go-shadowsocks2-v0.1.7_GH0.tar.gz) = 20028 -SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e -SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 -SHA256 (go-chi-chi-v5.0.3_GH0.tar.gz) = e68ad95cead1c1909a8b4588760914a768598a23c1c52d4547047142814689a5 -SIZE (go-chi-chi-v5.0.3_GH0.tar.gz) = 82133 -SHA256 (go-chi-cors-v1.2.0_GH0.tar.gz) = f9da3db2ad76085112fb6b47e7a2f22ab0adac88cdc5071ea5faf3e862139cc0 -SIZE (go-chi-cors-v1.2.0_GH0.tar.gz) = 8405 -SHA256 (go-chi-render-v1.0.1_GH0.tar.gz) = b7ee66207e869baa271f104d084a38d3d89bb3ebaea1d89169ca26303446422d -SIZE (go-chi-render-v1.0.1_GH0.tar.gz) = 5571 -SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04 -SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898 -SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0 -SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209 -SHA256 (gofrs-uuid-v4.0.0_GH0.tar.gz) = 7857a4f0c066d2e43a1b7912458b028b6fa351eb1a1d41b022dd6ac347e96b4f -SIZE (gofrs-uuid-v4.0.0_GH0.tar.gz) = 17824 -SHA256 (golang-crypto-38f3c27a63bf_GH0.tar.gz) = b55bc13c8a313ed80310a84eb7cceb303532774439493636a89b17c170250e31 -SIZE (golang-crypto-38f3c27a63bf_GH0.tar.gz) = 1731839 -SHA256 (golang-net-16afe75a6701_GH0.tar.gz) = add2a3e3e96dba7ddecd716513e6b4219d173fdcbbb69e51ecba998b52d4328a -SIZE (golang-net-16afe75a6701_GH0.tar.gz) = 1251445 -SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda -SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752 -SHA256 (golang-sys-a76c4d0a0096_GH0.tar.gz) = e0bcc87bd6f23e82bdcfe4c200815fa6ee8862578edd59d00374769e0b798598 -SIZE (golang-sys-a76c4d0a0096_GH0.tar.gz) = 1192386 -SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760 -SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095 -SHA256 (gorilla-websocket-v1.4.2_GH0.tar.gz) = 91937a36bc9e0da3c895c73d4cb74b2cdb1aff54ab21b0d0724000e7b5b85b84 -SIZE (gorilla-websocket-v1.4.2_GH0.tar.gz) = 54101 -SHA256 (miekg-dns-v1.1.42_GH0.tar.gz) = 167b2c2c9cb96d07c97db2c46286914fb74d09be5b02d7149f4918782d675ccb -SIZE (miekg-dns-v1.1.42_GH0.tar.gz) = 200831 -SHA256 (oschwald-geoip2-golang-v1.5.0_GH0.tar.gz) = d63758fa83c0dbe54195f32d97be69e6240ecd0663812068c1c3fd0335c4bb4b -SIZE (oschwald-geoip2-golang-v1.5.0_GH0.tar.gz) = 9599 -SHA256 (oschwald-maxminddb-golang-v1.8.0_GH0.tar.gz) = bb215e75bc25e25ccd733225ccc2f2144ab10a76d616f13232d5cd873b983986 -SIZE (oschwald-maxminddb-golang-v1.8.0_GH0.tar.gz) = 25029 -SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda -SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 -SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74 -SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161 -SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6 -SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073 -SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1 -SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566 +TIMESTAMP = 1625418451 +SHA256 (go/net_clash/clash-v1.6.5/v1.6.5.mod) = 1cf7d85b6d30d37c74a6973bbb66e5b5afc7187ff599c4654d510f9d4ff04bcf +SIZE (go/net_clash/clash-v1.6.5/v1.6.5.mod) = 689 +SHA256 (go/net_clash/clash-v1.6.5/v1.6.5.zip) = a295f4808ae24baf62e9a640f3aed1460de702714640bbc6eb0a9b3b967c5a81 +SIZE (go/net_clash/clash-v1.6.5/v1.6.5.zip) = 233558 diff --git a/net/clash/files/patch-proxy_redir_tcp__freebsd.go b/net/clash/files/patch-listener_redir_tcp__freebsd.go similarity index 65% rename from net/clash/files/patch-proxy_redir_tcp__freebsd.go rename to net/clash/files/patch-listener_redir_tcp__freebsd.go index ecffde3e282d..a4b1df21095b 100644 --- a/net/clash/files/patch-proxy_redir_tcp__freebsd.go +++ b/net/clash/files/patch-listener_redir_tcp__freebsd.go @@ -1,7 +1,7 @@ ---- proxy/redir/tcp_freebsd.go.orig 2018-12-08 09:12:52 UTC -+++ proxy/redir/tcp_freebsd.go -@@ -38,7 +38,8 @@ func parserPacket(conn net.Conn) (socks. - func getorigdst(fd uintptr) (socks.Addr, error) { +--- listener/redir/tcp_freebsd.go.orig 2021-07-04 17:12:45 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) - if err := socketcall(GETSOCKOPT, fd, syscall.IPPROTO_IP, SO_ORIGINAL_DST, uintptr(unsafe.Pointer(&raw)), uintptr(unsafe.Pointer(&siz)), 0); err != nil {