From 1cc613f27dcf6fff1ee28f8d9e66ed9a24733866 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 9 Aug 2019 11:00:41 +0200
Subject: [PATCH] Update golang and shadowosocks v2ray plugin

---
 golang/golang-golang-x-crypto/Makefile | 6 +++---
 golang/golang-version.mk               | 4 ++--
 golang/golang/Makefile                 | 2 +-
 shadowsocks-v2ray-plugin/Makefile      | 5 +++--
 v2ray-core/Makefile                    | 6 ++++--
 v2ray-ext/Makefile                     | 4 ++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/golang/golang-golang-x-crypto/Makefile b/golang/golang-golang-x-crypto/Makefile
index e787e04c5..b2d09364f 100644
--- a/golang/golang-golang-x-crypto/Makefile
+++ b/golang/golang-golang-x-crypto/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/golang/crypto.git
-PKG_SOURCE_VERSION:=a49355c7e3f8fe157a85be2f77e6e269a0f89602
-PKG_SOURCE_DATE:=20180620
-PKG_MIRROR_HASH:=80b16b203736ac56883d0610edbc5981eb78f15b7b35d11b5ca639f7c3814214
+PKG_SOURCE_VERSION:=4def268fd1a49955bfb3dda92fe3db4f924f2285
+PKG_SOURCE_DATE:=20190701
+#PKG_MIRROR_HASH:=80b16b203736ac56883d0610edbc5981eb78f15b7b35d11b5ca639f7c3814214
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
diff --git a/golang/golang-version.mk b/golang/golang-version.mk
index 494111452..385161d23 100644
--- a/golang/golang-version.mk
+++ b/golang/golang-version.mk
@@ -10,5 +10,5 @@ ifeq ($(origin GO_INCLUDE_DIR),undefined)
 endif
 
 
-GO_VERSION_MAJOR_MINOR:=1.11
-GO_VERSION_PATCH:=5
+GO_VERSION_MAJOR_MINOR:=1.12
+GO_VERSION_PATCH:=7
diff --git a/golang/golang/Makefile b/golang/golang/Makefile
index 49e69a585..29abf80f6 100644
--- a/golang/golang/Makefile
+++ b/golang/golang/Makefile
@@ -18,7 +18,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
 
 PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
 PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
-PKG_HASH:=bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e
+PKG_HASH:=95e8447d6f04b8d6a62de1726defbb20ab203208ee167ed15f83d7978ce43b13
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
diff --git a/shadowsocks-v2ray-plugin/Makefile b/shadowsocks-v2ray-plugin/Makefile
index d6ae4b7d6..bdd19fdb2 100644
--- a/shadowsocks-v2ray-plugin/Makefile
+++ b/shadowsocks-v2ray-plugin/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2018-2019 chenhw2 <https://github.com/chenhw2>
+# Copyright (C) 2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project
 #
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
@@ -8,11 +9,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-plugin
-PKG_MAINTAINER:=chenhw2 <https://github.com/chenhw2>
+PKG_MAINTAINER:=Ycarus
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/shadowsocks/v2ray-plugin.git
-PKG_SOURCE_VERSION:=1e5b3780468cadb1b3efa456434b525c208c888d
+PKG_SOURCE_VERSION:=2e56b2b70d12233e336afbaa6788bf5f5c12e2ee
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile
index b0d47d945..15e6ca6b3 100644
--- a/v2ray-core/Makefile
+++ b/v2ray-core/Makefile
@@ -12,8 +12,10 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/v2ray/v2ray-core.git
-PKG_SOURCE_VERSION:=d21d02d0e072b779405ebbbfb5e7f15e6d39d610
-PKG_SOURCE_DATE:=20190228
+PKG_SOURCE_VERSION:=8115221414394fecac400ed2afb77a4c5367fd31
+#PKG_SOURCE_VERSION:=d21d02d0e072b779405ebbbfb5e7f15e6d39d610
+PKG_SOURCE_DATE:=20190808
+#PKG_SOURCE_DATE:=20190228
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
diff --git a/v2ray-ext/Makefile b/v2ray-ext/Makefile
index 4375e2eeb..f1fd155fb 100644
--- a/v2ray-ext/Makefile
+++ b/v2ray-ext/Makefile
@@ -12,8 +12,8 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/v2ray/ext.git
-PKG_SOURCE_VERSION:=ee571a46b947fe83345584a0d4bdf25a367c1c35
-PKG_SOURCE_DATE:=20190301
+PKG_SOURCE_VERSION:=9eb3057da9bf83f83f4f1bda8528d0567419e709
+PKG_SOURCE_DATE:=20190725
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE