diff --git a/Makefile b/Makefile index 224c37d..17c8586 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frp -PKG_VERSION:=0.24.1 +PKG_VERSION:=0.25.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=356ec7880f506fe9978f14f866285b6873c2ede2e08e571bc7ea7f1baff570ed +PKG_HASH:=011b4ccc69c90bef2496245aac0fa5e65561e844cb09c7741309b3eb17dfc18b PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/patches/001-fix_go_modules.patch b/patches/001-fix_go_modules.patch deleted file mode 100644 index 9b3af57..0000000 --- a/patches/001-fix_go_modules.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/go.mod -+++ b/go.mod -@@ -12,7 +12,7 @@ require ( - github.com/gorilla/context v1.1.1 // indirect - github.com/gorilla/mux v1.6.2 - github.com/gorilla/websocket v1.2.0 -- github.com/hashicorp/yamux v0.0.0-20180314200745-2658be15c5f0 -+ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/mattn/go-runewidth v0.0.4 // indirect - github.com/pkg/errors v0.8.0 // indirect -@@ -23,7 +23,7 @@ require ( - github.com/spf13/pflag v1.0.1 // indirect - github.com/stretchr/testify v1.2.1 - github.com/templexxx/cpufeat v0.0.0-20170927014610-3794dfbfb047 // indirect -- github.com/templexxx/reedsolomon v0.0.0-20170926020725-5e06b81a1c76 // indirect -+ github.com/templexxx/reedsolomon v0.0.0-20170927015403-7092926d7d05 // indirect - github.com/templexxx/xor v0.0.0-20170926022130-0af8e873c554 // indirect - github.com/tjfoc/gmsm v0.0.0-20171124023159-98aa888b79d8 // indirect - github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec ---- a/go.sum -+++ b/go.sum -@@ -9,7 +9,7 @@ github.com/gorilla/context v1.1.1 h1:AWw - github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= - github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= - github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= --github.com/hashicorp/yamux v0.0.0-20180314200745-2658be15c5f0/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -+github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= - github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= - github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= - github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= -@@ -22,7 +22,7 @@ github.com/spf13/cobra v0.0.3/go.mod h1: - github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= - github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= - github.com/templexxx/cpufeat v0.0.0-20170927014610-3794dfbfb047/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= --github.com/templexxx/reedsolomon v0.0.0-20170926020725-5e06b81a1c76/go.mod h1:ToWcj2sZ6xHl14JjZiVDktYpFtrFZJXBlsu7TV23lNg= -+github.com/templexxx/reedsolomon v0.0.0-20170927015403-7092926d7d05/go.mod h1:ToWcj2sZ6xHl14JjZiVDktYpFtrFZJXBlsu7TV23lNg= - github.com/templexxx/xor v0.0.0-20170926022130-0af8e873c554/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= - github.com/tjfoc/gmsm v0.0.0-20171124023159-98aa888b79d8/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc= - github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec/go.mod h1:owBmyHYMLkxyrugmfwE/DLJyW8Ro9mkphwuVErQ0iUw=