From 63c224e2697a954b25cfdf6af293cbfd44452a6c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 09:27:41 +0800 Subject: [PATCH] update 04-07 09:27 --- mosdns/Makefile | 2 +- v2ray-plugin/Makefile | 34 ------------------- v2ray-plugin/patches/010-go-1.18.patch | 47 ++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 35 deletions(-) create mode 100644 v2ray-plugin/patches/010-go-1.18.patch diff --git a/mosdns/Makefile b/mosdns/Makefile index bf22b3722..60dc89a68 100644 --- a/mosdns/Makefile +++ b/mosdns/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mosdns -PKG_VERSION:=7ee99d4 +PKG_VERSION:=35745ff PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/v2ray-plugin/Makefile b/v2ray-plugin/Makefile index e45b72e7e..ffe6cabf7 100644 --- a/v2ray-plugin/Makefile +++ b/v2ray-plugin/Makefile @@ -22,33 +22,11 @@ PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 GO_PKG:=github.com/shadowsocks/v2ray-plugin -GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS_X:=main.VERSION=v$(PKG_VERSION) -PKG_CONFIG_DEPENDS := \ - CONFIG_V2RAY_PLUGIN_INCLUDE_GOPROXY \ - CONFIG_V2RAY_PLUGIN_COMPRESS_UPX - include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/v2ray-plugin/config -config V2RAY_PLUGIN_INCLUDE_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config V2RAY_PLUGIN_COMPRESS_UPX - bool "Compress executable files with UPX" - depends on !mips64 - default n -endef - -ifeq ($(CONFIG_V2RAY_PLUGIN_INCLUDE_GOPROXY),y) -export GO111MODULE=on -export GOPROXY=https://goproxy.bj.bcebos.com -#export GOPROXY=https://mirrors.aliyun.com/goproxy/ -endif - define Package/v2ray-plugin SECTION:=net CATEGORY:=Network @@ -58,17 +36,5 @@ define Package/v2ray-plugin DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle endef -define Build/Compile - $(call GoPackage/Build/Compile) -ifneq ($(CONFIG_V2RAY_PLUGIN_COMPRESS_UPX),) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/v2ray-plugin -endif -endef - -define Package/v2ray-plugin/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ray-plugin $(1)/usr/bin/v2ray-plugin -endef - $(eval $(call GoBinPackage,v2ray-plugin)) $(eval $(call BuildPackage,v2ray-plugin)) diff --git a/v2ray-plugin/patches/010-go-1.18.patch b/v2ray-plugin/patches/010-go-1.18.patch new file mode 100644 index 000000000..3dfd496b7 --- /dev/null +++ b/v2ray-plugin/patches/010-go-1.18.patch @@ -0,0 +1,47 @@ +--- a/go.mod ++++ b/go.mod +@@ -13,9 +13,10 @@ require ( + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect + github.com/gorilla/websocket v1.4.2 // indirect +- github.com/lucas-clemente/quic-go v0.24.0 // indirect +- github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect +- github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect ++ github.com/lucas-clemente/quic-go v0.25.0 // indirect ++ github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect ++ github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect ++ github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/onsi/ginkgo v1.16.4 // indirect + github.com/pires/go-proxyproto v0.6.1 // indirect +--- a/go.sum ++++ b/go.sum +@@ -205,8 +205,9 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv + github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= + github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= + github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +-github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g= + github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= ++github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc= ++github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= + github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc= + github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg= + github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= +@@ -214,10 +215,15 @@ github.com/magiconair/properties v1.8.1/ + github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= + github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= + github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= +-github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= + github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= +-github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= ++github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ= ++github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= + github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= ++github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc= ++github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= ++github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI= ++github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y= ++github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= + github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= + github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= + github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=