From: Jeffery To <redacted>
Date: Sun, 2 Feb 2020 20:35:09 +0000 (+0800)
Subject: golang: Update to 1.13.7, add PKG_CPE_ID to Makefile
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0dc4fa6efbc7588e9d49b8b6f0199918bb3af882;p=openwrt-packages.git

golang: Update to 1.13.7, add PKG_CPE_ID to Makefile

This update includes fixes for[1]:
* CVE-2020-7919 - doesn't appear to be published publicly yet
* CVE-2020-0601 - a Windows-related issue

[1]: https://github.com/golang/go/issues?q=milestone%3AGo1.13.7+label%3ACherryPickApproved

Signed-off-by: Jeffery To <redacted>
---

diff --git a/lang/golang/golang-version.mk b/lang/golang/golang-version.mk
index 55dedb69c..cc430d707 100644
--- a/lang/golang/golang-version.mk
+++ b/lang/golang/golang-version.mk
@@ -11,4 +11,4 @@ endif
 
 
 GO_VERSION_MAJOR_MINOR:=1.13
-GO_VERSION_PATCH:=6
+GO_VERSION_PATCH:=7
diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile
index ca27eae94..aa2c9e099 100644
--- a/lang/golang/golang/Makefile
+++ b/lang/golang/golang/Makefile
@@ -18,11 +18,12 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
 
 PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
 PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
-PKG_HASH:=aae5be954bdc40bcf8006eb77e8d8a5dde412722bc8effcdaf9772620d06420c
+PKG_HASH:=e4ad42cc5f5c19521fbbbde3680995f2546110b5c6aa2b48c3754ff7af9b41f4
 
+PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
+PKG_CPE_ID:=cpe:/a:golang:go
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_DIR:=$(BUILD_DIR)/go-$(PKG_VERSION)