Skip to content
Permalink
Browse files

tools/go-src: bump to 1.13

  • Loading branch information...
The-BB committed Sep 20, 2019
1 parent 62d25f9 commit 7d259dd0727eddef6ab9845e5823f2b734a98d7d
Showing with 14 additions and 18 deletions.
  1. +2 −2 tools/go-src/Makefile
  2. +12 −16 tools/go-src/patches/500-entware.patch
@@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=go-src
PKG_VERSION:=1.12.5
PKG_VERSION:=1.13

PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
PKG_SOURCE_URL:=https://dl.google.com/go
HOST_BUILD_DIR:=$(STAGING_DIR_HOST)/go
PKG_HASH:=2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8
PKG_HASH:=3fc0b8b6101d42efd7da1da3029c0a13f22079c0c37ef9730209d8ec665bf122

include $(INCLUDE_DIR)/host-build.mk

@@ -1,29 +1,26 @@
diff -Naur go.org/src/crypto/x509/root_linux.go go/src/crypto/x509/root_linux.go
--- go.org/src/crypto/x509/root_linux.go 2018-02-16 20:12:19.000000000 +0300
+++ go/src/crypto/x509/root_linux.go 2018-03-22 12:07:24.313796091 +0300
@@ -6,6 +6,7 @@
--- a/src/crypto/x509/root_linux.go
+++ b/src/crypto/x509/root_linux.go
@@ -6,6 +6,7 @@ package x509

// Possible certificate files; stop after finding one.
var certFiles = []string{
+ "/opt/etc/ssl/certs/ca-certificates.crt", // Entware
"/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc.
"/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL 6
"/etc/ssl/ca-bundle.pem", // OpenSUSE
diff -Naur go.org/src/crypto/x509/root_unix.go go/src/crypto/x509/root_unix.go
--- go.org/src/crypto/x509/root_unix.go 2018-02-16 20:12:19.000000000 +0300
+++ go/src/crypto/x509/root_unix.go 2018-03-22 12:07:04.297796091 +0300
@@ -14,6 +14,7 @@
--- a/src/crypto/x509/root_unix.go
+++ b/src/crypto/x509/root_unix.go
@@ -14,6 +14,7 @@ import (
// Possible directories with certificate files; stop after successfully
// reading at least one file from a directory.
var certDirectories = []string{
+ "/opt/etc/ssl/certs", // Entware
"/etc/ssl/certs", // SLES10/SLES11, https://golang.org/issue/12139
"/system/etc/security/cacerts", // Android
"/usr/local/share/certs", // FreeBSD
diff -Naur go.org/src/net/conf.go go/src/net/conf.go
--- go.org/src/net/conf.go 2018-02-16 20:12:19.000000000 +0300
+++ go/src/net/conf.go 2018-03-22 12:08:12.373796091 +0300
@@ -93,7 +93,7 @@
--- a/src/net/conf.go
+++ b/src/net/conf.go
@@ -94,7 +94,7 @@ func initConfVal() {
}

if runtime.GOOS != "openbsd" {
@@ -32,10 +29,9 @@ diff -Naur go.org/src/net/conf.go go/src/net/conf.go
}

confVal.resolv = dnsReadConfig("/etc/resolv.conf")
diff -Naur go.org/src/time/zoneinfo_unix.go go/src/time/zoneinfo_unix.go
--- go.org/src/time/zoneinfo_unix.go 2018-02-16 20:12:19.000000000 +0300
+++ go/src/time/zoneinfo_unix.go 2018-03-22 12:09:04.037796091 +0300
@@ -34,7 +34,7 @@
--- a/src/time/zoneinfo_unix.go
+++ b/src/time/zoneinfo_unix.go
@@ -34,7 +34,7 @@ func initLocal() {
tz, ok := syscall.Getenv("TZ")
switch {
case !ok:

0 comments on commit 7d259dd

Please sign in to comment.
You can’t perform that action at this time.