From 9e823713342717e9ad593547a1c838c9512a0102 Mon Sep 17 00:00:00 2001 From: 5schatten Date: Sat, 13 Apr 2019 10:06:55 +0200 Subject: [PATCH] go: updated to 1.12.3 --- packages/addons/addon-depends/go/package.mk | 14 +++++++------- .../go/patches/go-0001-add-ca-cert-location.patch | 11 +++++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index 50809fa78e..7506b92a84 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="go" -PKG_VERSION="1.11.2" -PKG_SHA256="7854866866c57394217ae5facc41944dff2a7386a064b2bcc4149f7c68e3c79a" +PKG_VERSION="1.12.3" +PKG_SHA256="b710a65982e9001ef99a167cf6e8636e46ec36a10e487e7c1c7384cdcd6fcd7c" PKG_LICENSE="BSD" PKG_SITE="https://golang.org" PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz" @@ -21,7 +21,7 @@ PKG_TOOLCHAIN="manual" configure_host() { export GOOS=linux - export GOROOT_FINAL=$TOOLCHAIN/lib/golang + export GOROOT_FINAL=${TOOLCHAIN}/lib/golang if [ -x /usr/lib/go/bin/go ]; then export GOROOT_BOOTSTRAP=/usr/lib/go else @@ -31,16 +31,16 @@ configure_host() { } make_host() { - cd $PKG_BUILD/src + cd ${PKG_BUILD}/src bash make.bash --no-banner } pre_makeinstall_host() { # need to cleanup old golang version when updating to a new version - rm -rf $TOOLCHAIN/lib/golang + rm -rf ${TOOLCHAIN}/lib/golang } makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/golang - cp -av $PKG_BUILD/* $TOOLCHAIN/lib/golang/ + mkdir -p ${TOOLCHAIN}/lib/golang + cp -av ${PKG_BUILD}/* ${TOOLCHAIN}/lib/golang/ } diff --git a/packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch b/packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch index c64b430f03..262af0f640 100644 --- a/packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch +++ b/packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch @@ -1,11 +1,10 @@ -diff -Naur go-1.9.2.orig/src/crypto/x509/root_unix.go go-1.9.2/src/crypto/x509/root_unix.go ---- go-1.9.2.orig/src/crypto/x509/root_unix.go 2017-11-03 14:58:53.655965257 +0100 -+++ go-1.9.2/src/crypto/x509/root_unix.go 2017-11-03 14:59:16.923786983 +0100 -@@ -19,6 +19,7 @@ - "/usr/local/share/certs", // FreeBSD +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -20,6 +20,7 @@ "/etc/pki/tls/certs", // Fedora/RHEL "/etc/openssl/certs", // NetBSD -+ "/etc/ssl", // LibreELEC + "/var/ssl/certs", // AIX ++ "/etc/ssl", // LibreELEC } const (