From f659dfe9f7b8c124fa3244a41a25462a242ce46f Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 14 Apr 2023 00:26:38 +0800 Subject: [PATCH 1/2] golang: Update to 1.20.3 Included fixes for: - CVE-2023-24534 - CVE-2023-24536 - CVE-2023-24537 - CVE-2023-24538 Refreshed patches. Signed-off-by: Tianling Shen --- lang/golang/golang/Makefile | 4 ++-- ...link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 8bffca8fa..5ad751156 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.20 -GO_VERSION_PATCH:=2 +GO_VERSION_PATCH:=3 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:=4d0e2850d197b4ddad3bdb0196300179d095bb3aefd4dfbc3b36702c3728f8ab +PKG_HASH:=e447b498cde50215c4f7619e5124b0fc4e25fb5d16ea47271c47f278e7aa763a PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause diff --git a/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch b/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch index 683480442..aecf5309f 100644 --- a/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch +++ b/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch @@ -13,7 +13,7 @@ Fixes #22040. --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1535,25 +1535,20 @@ func (ctxt *Link) hostlink() { +@@ -1548,25 +1548,20 @@ func (ctxt *Link) hostlink() { } if ctxt.Arch.InFamily(sys.ARM, sys.ARM64) && buildcfg.GOOS == "linux" { From bc1ac271e89053448beac0a50efba8c1156743e0 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Fri, 14 Apr 2023 13:42:23 +0900 Subject: [PATCH 2/2] node: bump to v18.16.0 Description: Update to v18.16.0 Fixed a bug when selecting arm-fpu for vfpv3-d16. Notable changes Add initial support for single executable applications Replace url parser with Ada Signed-off-by: Hirokazu MORIKAWA --- lang/node/Makefile | 12 +++++++----- lang/node/patches/999-localhost-no-addrconfig.patch | 2 +- ...vert_enable_pointer_authentication_on_arm64.patch | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lang/node/Makefile b/lang/node/Makefile index 5471d752d..a0cf9f928 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=node -PKG_VERSION:=v18.15.0 +PKG_VERSION:=v18.16.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION) -PKG_HASH:=8e44d65018ff973284195c23186469a0ea4082e97ec4200e5f5706d5584daa37 +PKG_HASH:=33d81a233e235a509adda4a4f2209008d04591979de6b3f0f67c1c906093f118 PKG_MAINTAINER:=Hirokazu MORIKAWA , Adrian Panella PKG_LICENSE:=MIT @@ -118,10 +118,12 @@ CONFIGURE_ARGS:= \ --shared-libuv \ --shared-cares \ --with-intl=$(if $(CONFIG_NODEJS_ICU_SMALL),small-icu,$(if $(CONFIG_NODEJS_ICU_SYSTEM),system-icu,none)) \ - $(if $(findstring +neon,$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \ - $(if $(findstring +vfp",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfp) \ - $(if $(findstring +vfpv3",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3-d16) \ + $(if $(findstring +neon",$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \ + $(if $(findstring +neon-vfpv4",$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \ $(if $(findstring +vfpv4",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3) \ + $(if $(findstring +vfp",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfp) \ + $(if $(findstring +vfpv3",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3) \ + $(if $(findstring +vfpv3-d16",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3-d16) \ --prefix=/usr HOST_CONFIGURE_VARS:= diff --git a/lang/node/patches/999-localhost-no-addrconfig.patch b/lang/node/patches/999-localhost-no-addrconfig.patch index 50d3f4a1c..a11ce086c 100644 --- a/lang/node/patches/999-localhost-no-addrconfig.patch +++ b/lang/node/patches/999-localhost-no-addrconfig.patch @@ -14,7 +14,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816 // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -1265,13 +1266,6 @@ function lookupAndConnect(self, options) - hints: options.hints || 0 + hints: options.hints || 0, }; - if (!isWindows && diff --git a/lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch b/lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch index d389c30c8..2d2035618 100644 --- a/lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch +++ b/lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch @@ -1,6 +1,6 @@ --- a/configure.py +++ b/configure.py -@@ -1290,7 +1290,6 @@ def configure_node(o): +@@ -1296,7 +1296,6 @@ def configure_node(o): # Enable branch protection for arm64 if target_arch == 'arm64':