From d147879372c8f320f17ab41e0e8cf783e04f0718 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 27 Jun 2022 19:04:46 +0800 Subject: [PATCH] sagernet-core: Update to 5.0.16 Signed-off-by: Tianling Shen --- sagernet-core/Makefile | 8 ++++---- sagernet-core/patches/100-obfs.patch | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sagernet-core/Makefile b/sagernet-core/Makefile index 20dd4d2a0..6d61cd995 100644 --- a/sagernet-core/Makefile +++ b/sagernet-core/Makefile @@ -5,14 +5,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sagernet-core -BASE_VERSION:=5.0.15 +BASE_VERSION:=5.0.16 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/SagerNet/v2ray-core.git -PKG_SOURCE_DATE:=2022-06-14 -PKG_SOURCE_VERSION:=eb9f1a689e37c9577825165d50d562c2e7747f2a -PKG_MIRROR_HASH:=9cc7b4a5b2830ac72510c519f59e83e902347965fcfa57ed7cad0b43dfd80cab +PKG_SOURCE_DATE:=2022-06-26 +PKG_SOURCE_VERSION:=b5f100d6a37a1a33d21c3f3781dc123124fba949 +PKG_MIRROR_HASH:=5b123b5db03039bb5c38bb7b70bb7097ce1ddbac650cecba8422155481e59ddf PKG_VERSION:=$(BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION)) PKG_LICENSE:=GPL-3.0-or-later diff --git a/sagernet-core/patches/100-obfs.patch b/sagernet-core/patches/100-obfs.patch index 0fc3cb5fd..4a8662b29 100644 --- a/sagernet-core/patches/100-obfs.patch +++ b/sagernet-core/patches/100-obfs.patch @@ -9,7 +9,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs go 1.18 require ( -+ github.com/Dreamacro/clash v1.10.6 ++ github.com/Dreamacro/clash v1.11.0 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da github.com/dgryski/go-camellia v0.0.0-20191119043421-69a8a13fb23d github.com/dgryski/go-idea v0.0.0-20170306091226-d2fb45a411fb @@ -29,7 +29,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs + github.com/sirupsen/logrus v1.8.1 // indirect github.com/xtaci/smux v1.5.16 // indirect go4.org/intern v0.0.0-20220301175310-a089fc204883 // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect + go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect --- a/go.sum +++ b/go.sum @@ -355,6 +355,8 @@ github.com/rogpeppe/go-internal v1.8.0/g @@ -40,7 +40,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs +github.com/sagernet/clash v1.10.7-0.20220610080510-ac56b2a05ded/go.mod h1:qrmVDeYq4Gr8SiGuxVoA4cc4xhq7TNgnLa76AANNYRA= github.com/sagernet/gvisor v0.0.0-20220402114650-763d12dc953e h1:Y4avBAtZ59OWvLl6zP9sF62jtMEVRPIH78IQctq9aXQ= github.com/sagernet/gvisor v0.0.0-20220402114650-763d12dc953e/go.mod h1:tWwEcFvJavs154OdjFCw78axNrsDlz4Zh8jvPqwcpGI= - github.com/sagernet/sing v0.0.0-20220614091938-64835a637bdc h1:AdNTzzSw6SCZI71GB+Am7cr+oUDUrBUaOi17FxDtNMw= + github.com/sagernet/sing v0.0.0-20220620074945-99754098d119 h1:YBlJc+jgan/xl1qnmT4FIEsdfuuS2IwGfPICqJHg54o= @@ -394,6 +396,8 @@ github.com/shurcooL/sanitized_anchor_nam github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= @@ -50,7 +50,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -@@ -451,6 +455,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go +@@ -453,6 +457,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM= go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -58,7 +58,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= -@@ -566,6 +571,7 @@ golang.org/x/sys v0.0.0-20190606165138-5 +@@ -569,6 +574,7 @@ golang.org/x/sys v0.0.0-20190606165138-5 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=