From aa96b8408f84a42142e44e930191a33143914b0d Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 13 Sep 2021 05:24:58 +0800 Subject: [PATCH 1/2] golang: Update to 1.17.1 Includes fix for CVE-2021-39293 (archive/zip: overflow in preallocation check can cause OOM panic). Signed-off-by: Jeffery To --- lang/golang/golang/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 1e8cd92547..533e029294 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.17 -GO_VERSION_PATCH:= +GO_VERSION_PATCH:=1 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,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:=3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d +PKG_HASH:=49dc08339770acd5613312db8c141eaf61779995577b89d93b541ef83067e5b1 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause From 9b3b837e20263f208d5a6a5235f4be2237f7cd60 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 13 Sep 2021 05:29:47 +0800 Subject: [PATCH 2/2] golang: Remove deprecated variables in golang-package.mk Signed-off-by: Jeffery To --- lang/golang/golang-package.mk | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk index 7144a45242..c4f4206834 100644 --- a/lang/golang/golang-package.mk +++ b/lang/golang/golang-package.mk @@ -314,14 +314,3 @@ define GoSrcPackage Package/$(1)/install=$$(call GoPackage/Package/Install/Src,$$(1)) endif endef - - -# Deprecated variables - these will be removed after the next OpenWrt release -GO_PKG_PATH=$(GO_PKG_BUILD_DEPENDS_PATH) -GO_PKG_WORK_DIR=$(PKG_BUILD_DIR)/$(GO_PKG_WORK_DIR_NAME) -GO_PKG_CACHE_DIR=$(GO_BUILD_CACHE_DIR) -GO_PKG_DEFAULT_VARS=$(GO_PKG_VARS) -GoPackage/Environment=$(GO_PKG_VARS) -GoPackage/is_dir_not_empty=$$$$($(FIND) "$(1)" -maxdepth 0 -type d \! -empty 2>/dev/null) -GoPackage/has_binaries=$(call GoPackage/is_dir_not_empty,$(GO_PKG_BUILD_BIN_DIR)) -# End of deprecated variables